pub/lct-hack
Watch
1
0
Fork
You've already forked lct-hack
 0
Code Releases Packages 5 Activity

Complete incident selection and 112 to DDS workflow

Browse source
This commit is contained in:
andreysk0304 2026-09-21 20:10:57 +03:00
commit 68dd83c7c2
21 changed files with 281 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

3
frontend/src/features/instructor/useControl.ts
View file

@ -25,7 +25,7 @@ export function useControl(sessionId: string | null) {
}, [sessionId]);
const start = useCallback(
(scenarioId: string, mode: SessionMode, trainee: string, exercise: "dds" | "call" | "card" = "dds", group?: string, traineeId?: string, scenarioIds?: string[]) => {
(scenarioId: string, mode: SessionMode, trainee: string, exercise: "dds" | "call" | "card" = "dds", group?: string, traineeId?: string, scenarioIds?: string[], handoffToDds = false) => {
const message = {
type: "scenario.start",
scenario_id: scenarioId,
@ -34,6 +34,7 @@ export function useControl(sessionId: string | null) {
group_id: group || null,
trainee_id: traineeId || null,
exercise,
handoff_to_dds: handoffToDds,
scenario_ids: scenarioIds?.length ? scenarioIds : undefined,
} as const;
channel.current?.send(message);

41
frontend/src/features/kio-card/KioCard.tsx
View file

@ -1,7 +1,7 @@
// Карточка КИО. Один и тот же компонент рисуется у курсанта, на пульте,
// на внешнем мониторе и на АРМ ДДС — там в режиме `readOnly`.
import { useSigns } from "@/shared/api/http";
import { useIncidentGroups, useSigns } from "@/shared/api/http";
import { type CardState, display } from "./merge";
import { type Field, type FieldGroup, visibleGroups } from "./fields";
@ -16,6 +16,7 @@ interface Props {
export function KioCard({ state, required = [], readOnly = false, referenceArm = false, onChange }: Props) {
const dds = display(state, "dds") as string | null;
const incidentGroup = display(state, "incident_group") as number | null;
const groups = visibleGroups(dds);
const section = (group: FieldGroup) => (
<section className={`kio-arm-section kio-arm-${group.area}`} key={group.title}>
@ -32,6 +33,7 @@ export function KioCard({ state, required = [], readOnly = false, referenceArm =
required={required.includes(field.path)}
readOnly={readOnly || field.readOnly}
referenceArm={referenceArm}
incidentGroup={incidentGroup}
onChange={onChange}
/>
))}
@ -54,7 +56,7 @@ export function KioCard({ state, required = [], readOnly = false, referenceArm =
}
function Row({
field, value, pending, required, readOnly, referenceArm, onChange,
field, value, pending, required, readOnly, referenceArm, incidentGroup, onChange,
}: {
field: Field;
value: unknown;
@ -62,6 +64,7 @@ function Row({
required: boolean;
readOnly?: boolean;
referenceArm: boolean;
incidentGroup: number | null;
onChange?: (path: string, value: unknown) => void;
}) {
const empty = value === null || value === undefined || value === "" || (Array.isArray(value) && value.length === 0);
@ -79,7 +82,7 @@ function Row({
{readOnly ? (
<span className="kio-arm-readonly">{formatValue(value, field)}</span>
) : (
<Input field={field} value={value} referenceArm={referenceArm} onChange={onChange} />
<Input field={field} value={value} referenceArm={referenceArm} incidentGroup={incidentGroup} onChange={onChange} />
)}
</div>
</div>
@ -87,11 +90,12 @@ function Row({
}
function Input({
field, value, referenceArm, onChange,
field, value, referenceArm, incidentGroup, onChange,
}: {
field: Field;
value: unknown;
referenceArm: boolean;
incidentGroup: number | null;
onChange?: (path: string, value: unknown) => void;
}) {
const emit = (next: unknown) => onChange?.(field.path, next);
@ -99,6 +103,12 @@ function Input({
if (field.kind === "list") {
return <span className="kio-arm-readonly">{formatValue(value)}</span>;
}
if (field.kind === "group") {
return <IncidentGroupPicker value={value as number | null} onChange={(next) => {
onChange?.("incident_group", next);
onChange?.("signs", []);
}} />;
}
if (field.kind === "bool") {
return (
<div className="kio-arm-choice" role="group" aria-label={field.label}>
@ -129,7 +139,7 @@ function Input({
);
}
if (field.kind === "signs") {
return <SignsPicker value={(value as string[]) ?? []} onChange={(next) => emit(next)} />;
return <SignsPicker value={(value as string[]) ?? []} group={incidentGroup} onChange={(next) => emit(next)} />;
}
if (field.kind === "textarea") {
return <textarea aria-label={field.label} rows={5} value={(value as string) ?? ""} placeholder="Введите сведения со слов заявителя" onChange={(e) => emit(e.target.value)} />;
@ -157,17 +167,30 @@ function Input({
);
}
function IncidentGroupPicker({ value, onChange }: { value: number | null; onChange: (next: number | null) => void }) {
const page = useIncidentGroups();
return <select aria-label="Категория происшествия" value={value ?? ""}
onChange={(event) => onChange(event.target.value ? Number(event.target.value) : null)}>
<option value="">Все категории ЕКП</option>
{page.data?.groups.map((group) => <option key={group.id} value={group.id}>{group.title}</option>)}
</select>;
}
/** Три признака происшествия каскадом: выбор верхнего сужает нижний.
*
* Значения приходят с сервера, а не лежат на фронте: классификатор — 1283 строки,
* и он обновляется файлом от заказчика (docs/spec/DATASET.md). Служба из выбора
* не следует — её считает сервер, поэтому здесь её нет. */
function SignsPicker({
value, onChange,
value, group, onChange,
}: {
value: string[];
group: number | null;
onChange: (next: string[]) => void;
}) {
if (group === null) {
return <p className="kio-signs-hint">Сначала выберите категорию происшествия — затем появятся признаки ЕКП.</p>;
}
const levels = [0, 1, 2];
return (
<div className="signs">
@ -175,6 +198,7 @@ function SignsPicker({
<SignSelect
key={level}
prefix={value.slice(0, level)}
group={group}
chosen={value[level] ?? ""}
onPick={(sign) => {
// Смена верхнего признака обнуляет нижние: они относились
@ -193,13 +217,14 @@ function SignsPicker({
}
function SignSelect({
prefix, chosen, onPick,
prefix, group, chosen, onPick,
}: {
prefix: string[];
group: number | null;
chosen: string;
onPick: (sign: string) => void;
}) {
const page = useSigns(prefix);
const page = useSigns(prefix, group);
const values = page.data?.values ?? [];
// Уровня может не быть: часть происшествий классифицируется двумя признаками.
if (!page.isLoading && values.length === 0) return null;

3
frontend/src/features/kio-card/fields.ts
View file

@ -6,7 +6,7 @@
import type { DDSCode, IncidentType } from "@/shared/types/generated";
export type FieldKind = "text" | "textarea" | "number" | "bool" | "select" | "signs" | "list";
export type FieldKind = "text" | "textarea" | "number" | "bool" | "select" | "signs" | "group" | "list";
export interface Field {
/** Путь в карточке: «floor», «fire.floors» — так же, как в `kio.patch`. */
@ -88,6 +88,7 @@ export const GROUPS: FieldGroup[] = [
title: "Происшествие",
area: "incident",
fields: [
{ path: "incident_group", label: "Категория происшествия", kind: "group" },
// Признаки по ЕКП — то, что оператор действительно проставляет.
// Код и список оповещения считает сервер (docs/spec/DATASET.md).
{ path: "signs", label: "Признаки происшествия", kind: "signs" },

56
frontend/src/pages/instructor/Instructor.tsx
View file

@ -15,7 +15,7 @@ import { StandStatus } from "@/features/health/StandStatus";
import { ModeBanner } from "@/features/mode-banner/ModeBanner";
import { useObserve } from "@/features/observe/useObserve";
import { InterviewTimer, Timers } from "@/features/timers/Timers";
import { useScenarios, useSessions, useTrainees } from "@/shared/api/http";
import { useIncidentGroups, useScenarios, useSessions, useTrainees } from "@/shared/api/http";
import { sessionIdFromUrl } from "@/shared/api/session";
import type { SessionMode } from "@/shared/types/generated";
@ -28,9 +28,12 @@ const MODES: { value: SessionMode; label: string }[] = [
export function Instructor() {
const [sessionId, setSessionId] = useState<string | null>(sessionIdFromUrl());
const [scenarioId, setScenarioId] = useState("");
const [ticketFilter, setTicketFilter] = useState("");
const [categoryFilter, setCategoryFilter] = useState("");
const [scenarioSearch, setScenarioSearch] = useState("");
const [extraScenarioIds, setExtraScenarioIds] = useState<string[]>([]);
const [mode, setMode] = useState<SessionMode>("training");
const [exercise, setExercise] = useState<"dds" | "call" | "card">("dds");
const [exercise, setExercise] = useState<"dds" | "call" | "card" | "card_dds">("dds");
const [trainee, setTrainee] = useState("");
const [traineeId, setTraineeId] = useState("");
const [noteFor, setNoteFor] = useState<string | null>(null);
@ -40,14 +43,24 @@ export function Instructor() {
const [noteText, setNoteText] = useState("");
const scenarios = useScenarios();
const incidentGroups = useIncidentGroups();
const history = useSessions();
const trainees = useTrainees();
const session = useObserve(sessionId);
const control = useControl(sessionId);
const visibleScenarios = (scenarios.data ?? []).filter((item) =>
(!ticketFilter || item.ticket === Number(ticketFilter)) &&
(!categoryFilter || item.ekp_group === Number(categoryFilter)) &&
(!scenarioSearch.trim() || `${item.title} ${item.id}`.toLocaleLowerCase("ru-RU")
.includes(scenarioSearch.trim().toLocaleLowerCase("ru-RU")))
).sort((a, b) => (a.ticket ?? 99) - (b.ticket ?? 99) || (a.position ?? 0) - (b.position ?? 0));
useEffect(() => {
if (scenarios.data?.length && !scenarioId) setScenarioId(scenarios.data[0].id);
}, [scenarios.data, scenarioId]);
if (!visibleScenarios.some((item) => item.id === scenarioId)) {
setScenarioId(visibleScenarios[0]?.id ?? "");
}
}, [scenarios.data, ticketFilter, categoryFilter, scenarioSearch, scenarioId]);
function startLesson() {
if (trainees.data?.length && !traineeId) return;
@ -65,8 +78,10 @@ export function Instructor() {
const selected = trainees.data?.find((item) => item.id === traineeId);
const scenarioIds = exercise === "dds"
? [scenarioId, ...extraScenarioIds.filter((id) => id !== scenarioId)] : undefined;
control.start(scenarioId, mode, selected?.name || trainee || "Демо-курсант", exercise,
undefined, selected?.id, scenarioIds && scenarioIds.length > 1 ? scenarioIds : undefined);
control.start(scenarioId, mode, selected?.name || trainee || "Демо-курсант",
exercise === "card_dds" ? "card" : exercise,
undefined, selected?.id, scenarioIds && scenarioIds.length > 1 ? scenarioIds : undefined,
exercise === "card_dds");
}, [sessionId, control, scenarioId, extraScenarioIds, mode, trainee, traineeId, trainees.data, exercise]);
const links = sessionId
@ -78,29 +93,44 @@ export function Instructor() {
: null;
return (
<main className="page">
<main className="page instructor-page">
<StandStatus />
<ModeBanner mode={session.mode ?? mode} />
<h1>Рабочее место преподавателя</h1>
<div className="columns">
<section style={{ flex: "0 0 280px" }}>
<div className="instructor-layout">
<section>
<h2>Занятие</h2>
<table className="grid">
<tbody>
<tr>
<th>Сценарий</th>
<td>
<div className="instructor-scenario-filters">
<select aria-label="Категория происшествия" value={categoryFilter} onChange={(event) => setCategoryFilter(event.target.value)}>
<option value="">Все 23 категории ЕКП</option>
{incidentGroups.data?.groups.map((group) =>
<option key={group.id} value={group.id}>{group.title}</option>)}
</select>
<select aria-label="Билет заказчика" value={ticketFilter} onChange={(event) => setTicketFilter(event.target.value)}>
<option value="">Все 32 билета</option>
{Array.from({ length: 32 }, (_, index) => <option key={index} value={index + 1}>Билет {index + 1}</option>)}
</select>
<input type="search" aria-label="Поиск сценария" value={scenarioSearch}
placeholder="Название или ID карточки" onChange={(event) => setScenarioSearch(event.target.value)} />
</div>
<select value={scenarioId} onChange={(event) => {
setScenarioId(event.target.value);
setExtraScenarioIds((previous) => previous.filter((id) => id !== event.target.value));
}}>
{scenarios.data?.map((scenario) => (
{!visibleScenarios.length && <option value="">Карточки не найдены</option>}
{visibleScenarios.map((scenario) => (
<option key={scenario.id} value={scenario.id}>
{scenario.title} · {scenario.level}
{scenario.ticket ? `Билет ${scenario.ticket}, вызов ${scenario.position} · ` : ""}{scenario.title} · {scenario.level}
</option>
))}
</select>
<small className="ref">{visibleScenarios.length} из {scenarios.data?.length ?? 0} карточек (96 — билеты заказчика)</small>
{exercise === "dds" && <details className="scenario-queue">
<summary>Дополнительные карточки ({extraScenarioIds.length})</summary>
<p className="ref">Карточки поступят последовательно после завершения текущей.</p>
@ -123,6 +153,8 @@ export function Instructor() {
onChange={() => setExercise("call")} /> Оператор 112 · звонок</label>
<label className="mode-choice"><input type="radio" checked={exercise === "card"}
onChange={() => setExercise("card")} /> Оператор 112 · текстовая вводная</label>
<label className="mode-choice"><input type="radio" checked={exercise === "card_dds"}
onChange={() => setExercise("card_dds")} /> Связка 112 → ДДС · одна карточка</label>
</td>
</tr>
<tr>
@ -235,7 +267,7 @@ export function Instructor() {
)}
</section>
<section style={{ flex: "0 0 260px" }}>
<section>
<h2>История группы</h2>
<p><a href="/profile">профили курсантов</a> · <a href="/groups">аналитика группы</a></p>
<table className="grid">

8
frontend/src/pages/trainee/Call.tsx
View file

@ -72,10 +72,14 @@ export function Call() {
</span>
{!call.cardSubmitted && <button type="button" className="arm-primary" disabled={call.status !== "open"}
onClick={call.submitCard}>Сохранить и проверить</button>}
{call.cardSubmitted && <strong>Карточка отправлена</strong>}
{call.cardSubmitted && <strong>{call.briefing.handoff_to_dds ? "Карточка передана ДДС" : "Карточка отправлена"}</strong>}
</footer>
{call.error && <p className="state-violated arm-message" role="alert">{call.error}</p>}
{call.cardSubmitted && !call.report && !call.reportError && <p className="arm-message">Карточка отправлена. Ожидаем итоговую оценку…</p>}
{call.cardSubmitted && !call.report && !call.reportError && <p className="arm-message">
{call.briefing.handoff_to_dds
? <>Карточка передана в ДДС. <a href={`/dds?session=${sessionId}&role=dds_01`}>Открыть АРМ ДДС</a> и завершить реагирование для итоговой оценки.</>
: "Карточка отправлена. Ожидаем итоговую оценку…"}
</p>}
{call.reportError && <p className="state-violated arm-message" role="alert">{call.reportError}</p>}
{call.report && <Debrief report={call.report} />}
</main>;

22
frontend/src/shared/api/http.ts
View file

@ -43,6 +43,9 @@ export interface ScenarioSummary {
topics: string[];
modes: SessionMode[];
dds: string | null;
ticket: number | null;
position: number | null;
ekp_group: number | null;
}
export interface SessionInfo {
@ -113,10 +116,23 @@ export interface SignsPage {
incident: { code: string; type: string; notify: string[] } | null;
}
export function useSigns(prefix: string[]) {
const query = prefix.map((sign) => `prefix=${encodeURIComponent(sign)}`).join("&");
export interface IncidentGroupsPage {
version: string;
groups: { id: number; title: string }[];
}
export const useIncidentGroups = () => useQuery({
queryKey: ["ekp-groups"], staleTime: Infinity,
queryFn: () => request<IncidentGroupsPage>("/api/ekp/groups"),
});
export function useSigns(prefix: string[], group: number | null = null) {
const params = new URLSearchParams();
if (group !== null) params.set("group", String(group));
for (const sign of prefix) params.append("prefix", sign);
const query = params.toString();
return useQuery({
queryKey: ["ekp-signs", prefix],
queryKey: ["ekp-signs", group, prefix],
// Справочник не меняется между занятиями — перезапрашивать незачем.
staleTime: Infinity,
queryFn: () => request<SignsPage>(`/api/ekp/signs${query ? `?${query}` : ""}`),

3
frontend/src/shared/types/generated.ts
View file

@ -85,6 +85,7 @@ export interface CardBriefing {
text: string;
required_fields: Array<string>;
card?: KIO | null;
handoff_to_dds?: boolean;
}
export interface CardNext {
@ -280,6 +281,7 @@ export interface KIO {
floor?: string | null;
intercom_code?: string | null;
coords?: Coords | null;
incident_group?: number | null;
signs?: Array<string>;
/** Код ЕКП по признакам */
incident_code?: string | null;
@ -423,6 +425,7 @@ export interface ScenarioStart {
group_id?: string | null;
mode: SessionMode;
exercise?: Exercise;
handoff_to_dds?: boolean;
}
/** Коррекция оценки. Автооценка сохраняется рядом. */

20
frontend/src/styles.css
View file

@ -53,6 +53,26 @@ button:disabled { opacity: 0.5; cursor: default; }
/* Две колонки: карточка и разговор рядом, как на настоящем АРМ. */
.columns { display: flex; gap: 24px; align-items: flex-start; flex-wrap: wrap; }
.columns > section { flex: 1 1 420px; min-width: 0; }
/* Пульт содержит длинные названия сценариев. Узкая первая колонка вместе с
min-width таблицы раньше перекрывала «Ход занятия» при zoom 200%. */
.instructor-layout { display: grid; grid-template-columns: minmax(300px, 360px) minmax(0, 1fr) minmax(230px, 280px); gap: 20px; align-items: start; }
.instructor-layout > section { min-width: 0; }
.instructor-layout .grid { width: 100%; min-width: 0; table-layout: fixed; }
.instructor-layout .grid th { width: 105px; }
.instructor-layout .grid td { min-width: 0; overflow-wrap: anywhere; }
.instructor-layout select, .instructor-layout input { box-sizing: border-box; max-width: 100%; min-width: 0; }
.instructor-layout section:first-child select, .instructor-layout section:first-child input[type="text"] { width: 100%; }
.instructor-layout .mode-choice { overflow-wrap: anywhere; }
.instructor-scenario-filters { display: grid; gap: 5px; margin-bottom: 6px; }
.kio-signs-hint { margin: 4px 0; color: #586572; font-size: 12px; }
@media (max-width: 1350px) {
.instructor-layout { grid-template-columns: minmax(280px, 360px) minmax(0, 1fr); }
.instructor-layout > section:last-child { grid-column: 1 / -1; }
}
@media (max-width: 900px) {
.instructor-layout { display: block; }
.instructor-layout > section { margin-bottom: 24px; }
}
.kio { display: flex; flex-direction: column; gap: 12px; }
.kio .grid { width: 100%; }
.kio thead th { background: var(--line); }