ychernenko/hockey_new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUILD124 — исправление HOME drag-and-drop + шильдики амплуа

Browse Source
This commit is contained in:
Юрий Черненко
2026-08-26 15:24:52 +03:00
parent aca538811f
commit 92d7927ffa
3 changed files with 48 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
ui_builder/static/app.js
View File

@@ -6881,7 +6881,12 @@ function openTimerQuickEditor(focusActionId = "") {
}
// BUILD122 — operator line/five sorting.
// BUILD122/124 — operator line/five sorting.
// Keep the active drag in memory because browsers can hide DataTransfer payload
// during dragover (protected mode). Empty line drop-zones must still accept a
// player, otherwise a team with no API line assignments cannot be organised.
let hockeyLineDragState = null;
function hockeyLinesGame() {
return getByPath(state.data, "hockey.selected_game") || null;
}
@@ -7007,12 +7012,29 @@ function openTimerQuickEditor(focusActionId = "") {
return payload;
}
function hockeyLineRoleBadge(player) {
const role = String(player?.role || "").trim().toLowerCase();
const position = String(player?.position || player?.position_ru || player?.position_en || "")
.trim().toLowerCase().replaceAll("ё", "е");
if (role === "goalkeeper" || /(^|\s)(вр|врат|goal|gk)(\s|$)/i.test(position)) {
return { label: "ВР", className: "is-goalkeeper", title: "Вратарь" };
}
if (role === "defender" || /защ|defen|(^|\s)d($|\s)/i.test(position)) {
return { label: "ЗАЩ", className: "is-defender", title: "Защитник" };
}
if (role === "forward" || /нап|forward|wing|center|centre|(^|\s)f($|\s)/i.test(position)) {
return { label: "НАП", className: "is-forward", title: "Нападающий" };
}
return null;
}
function hockeyLinePlayerCard(side, player, slotNumber = 0) {
const node = div("hockey-line-player");
const playerId = String(player?.external_id || player?.id || "");
const assignedLine = String(player?.line || "").trim();
const savedOrder = Number(player?.line_sort_order || 0);
const effectiveOrder = assignedLine ? (savedOrder > 0 ? savedOrder : Number(slotNumber || 0)) : 0;
const roleBadge = hockeyLineRoleBadge(player);
node.draggable = true;
node.dataset.playerId = playerId;
node.dataset.side = side;
@@ -7021,28 +7043,38 @@ function openTimerQuickEditor(focusActionId = "") {
<span class="hockey-line-drag" title="Перетащить">⋮⋮</span>
<b class="hockey-line-player-number">${escapeHtml(player?.number ? `#${player.number}` : "—")}</b>
<strong title="${escapeHtml(player?.name || "Игрок")}">${escapeHtml(player?.name || "Игрок")}</strong>
${roleBadge ? `<span class="hockey-line-role ${roleBadge.className}" title="${escapeHtml(roleBadge.title)}">${roleBadge.label}</span>` : ""}
${effectiveOrder > 0 ? `<span class="hockey-line-order" title="Порядок в звене / line_sort_order: ${effectiveOrder}">${effectiveOrder}</span>` : ""}
`;
node.addEventListener("dragstart", (event) => {
const payload = JSON.stringify({ side, playerId });
const dragPayload = { side, playerId };
const payload = JSON.stringify(dragPayload);
hockeyLineDragState = dragPayload;
event.dataTransfer.effectAllowed = "move";
event.dataTransfer.setData("application/x-hockey-line-player", payload);
event.dataTransfer.setData("text/plain", payload);
node.classList.add("is-dragging");
});
node.addEventListener("dragend", () => node.classList.remove("is-dragging"));
node.addEventListener("dragend", () => {
hockeyLineDragState = null;
node.classList.remove("is-dragging");
document.querySelectorAll(".hockey-line-dropzone.is-over,.hockey-line-player.is-drop-before")
.forEach((item) => item.classList.remove("is-over", "is-drop-before"));
});
return node;
}
function hockeyReadLineDrag(event) {
try {
const raw = event.dataTransfer?.getData("application/x-hockey-line-player") || event.dataTransfer?.getData("text/plain") || "";
const payload = JSON.parse(raw);
if (!payload?.side || !payload?.playerId) return null;
return payload;
if (raw) {
const payload = JSON.parse(raw);
if (payload?.side && payload?.playerId) return payload;
}
} catch (_) {
return null;
// During dragover browsers may intentionally hide DataTransfer data.
}
return hockeyLineDragState?.side && hockeyLineDragState?.playerId ? hockeyLineDragState : null;
}
function hockeyLineDropZone(side, lineNumber, players) {
@@ -7065,6 +7097,7 @@ function openTimerQuickEditor(focusActionId = "") {
card.classList.remove("is-drop-before");
const dragged = hockeyReadLineDrag(event);
if (!dragged || dragged.side !== side) return;
hockeyLineDragState = null;
if (!hockeyMoveLinePlayer(side, dragged.playerId, lineNumber, String(player?.external_id || player?.id || ""))) return;
renderRuntime();
try {
@@ -7077,7 +7110,9 @@ function openTimerQuickEditor(focusActionId = "") {
zone.appendChild(card);
});
zone.addEventListener("dragover", (event) => {
const dragged = hockeyReadLineDrag(event);
// Do not rely only on getData() here: it can be blank during dragover.
// The in-memory drag state makes empty HOME/AWAY line cards valid targets.
const dragged = hockeyLineDragState || hockeyReadLineDrag(event);
if (!dragged || dragged.side !== side) return;
event.preventDefault();
event.dataTransfer.dropEffect = "move";
@@ -7092,6 +7127,7 @@ function openTimerQuickEditor(focusActionId = "") {
zone.classList.remove("is-over");
const dragged = hockeyReadLineDrag(event);
if (!dragged || dragged.side !== side) return;
hockeyLineDragState = null;
if (!hockeyMoveLinePlayer(side, dragged.playerId, lineNumber)) return;
renderRuntime();
try {