From 92d7927ffa609de3ff7a87f83681d84285e1a214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=A7=D0=B5=D1=80=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=BA=D0=BE?= Date: Wed, 26 Aug 2026 15:24:52 +0300 Subject: [PATCH] =?UTF-8?q?BUILD124=20=E2=80=94=20=D0=B8=D1=81=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20HOME=20drag-and-dr?= =?UTF-8?q?op=20+=20=D1=88=D0=B8=D0=BB=D1=8C=D0=B4=D0=B8=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=B0=D0=BC=D0=BF=D0=BB=D1=83=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.py | 2 +- ui_builder/static/app.js | 52 ++++++++++++++++++++++++++++++------ ui_builder/static/styles.css | 5 ++-- 3 files changed, 48 insertions(+), 11 deletions(-) diff --git a/app.py b/app.py index 97c4767..04e40fd 100644 --- a/app.py +++ b/app.py @@ -29,7 +29,7 @@ from ui_builder import install_ui_builder from khl_site.khl_data_center import APP as khl_site_app BASE_DIR = Path(__file__).resolve().parent -BUILD_VERSION = "2026.08.26.10" +BUILD_VERSION = "2026.08.26.11" # compatibility: BUILD_VERSION = "2026.08.26.1" # compatibility: BUILD_VERSION = "2026.08.25.1" # compatibility: BUILD_VERSION = "2026.08.24.15" diff --git a/ui_builder/static/app.js b/ui_builder/static/app.js index 11e376d..a27183f 100644 --- a/ui_builder/static/app.js +++ b/ui_builder/static/app.js @@ -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 = "") { ⋮⋮ ${escapeHtml(player?.number ? `#${player.number}` : "—")} ${escapeHtml(player?.name || "Игрок")} + ${roleBadge ? `${roleBadge.label}` : ""} ${effectiveOrder > 0 ? `${effectiveOrder}` : ""} `; 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 { diff --git a/ui_builder/static/styles.css b/ui_builder/static/styles.css index 9b48822..dc72e35 100644 --- a/ui_builder/static/styles.css +++ b/ui_builder/static/styles.css @@ -7799,8 +7799,9 @@ body.hockey-navigation-open .runtime-viewport.has-hockey-pbp { gap: 14px !import .hockey-line-card>header{display:flex;align-items:center;justify-content:space-between;gap:8px;padding:0 2px}.hockey-line-card>header strong{font-size:9px}.hockey-line-card>header span{display:grid;place-items:center;min-width:22px;height:18px;padding:0 5px;border-radius:999px;color:#7e97af;background:#14283b;font-size:7px;font-weight:950} .hockey-line-dropzone{min-height:42px;display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:5px;padding:3px;border:1px solid transparent;border-radius:8px;transition:border-color .12s,background .12s} .hockey-line-dropzone>span{grid-column:1/-1;align-self:center;color:#4f6880;font-size:8px;text-align:center}.hockey-line-dropzone.is-over{border-color:#54dcbf;background:rgba(84,220,191,.06)} -.hockey-line-player{min-width:0;min-height:34px;display:grid;grid-template-columns:10px 30px minmax(0,1fr) 22px;gap:4px;align-items:center;padding:4px 5px;border:1px solid #29445c;border-radius:8px;background:#102235;cursor:grab;transition:transform .1s,border-color .1s,opacity .1s}.hockey-line-player:hover{border-color:#47708f;transform:translateY(-1px)}.hockey-line-player.is-dragging{opacity:.35}.hockey-line-player.is-drop-before{border-color:#54e5c4;box-shadow:inset 3px 0 0 #54e5c4} +.hockey-line-player{min-width:0;min-height:34px;display:grid;grid-template-columns:10px 30px minmax(0,1fr) auto 22px;gap:4px;align-items:center;padding:4px 5px;border:1px solid #29445c;border-radius:8px;background:#102235;cursor:grab;transition:transform .1s,border-color .1s,opacity .1s}.hockey-line-player:hover{border-color:#47708f;transform:translateY(-1px)}.hockey-line-player.is-dragging{opacity:.35}.hockey-line-player.is-drop-before{border-color:#54e5c4;box-shadow:inset 3px 0 0 #54e5c4} .hockey-line-drag{color:#58738c;font-size:9px;letter-spacing:-2px;line-height:1}.hockey-line-player-number{display:grid;place-items:center;min-height:25px;border-radius:6px;color:#dcecff;background:#0a1724;font-size:8px}.hockey-line-player strong{min-width:0;overflow:hidden;font-size:8.5px;line-height:1.15;text-overflow:ellipsis;white-space:nowrap} +.hockey-line-role{display:grid;place-items:center;min-width:22px;height:17px;padding:0 4px;border:1px solid transparent;border-radius:5px;font-size:6.5px;font-weight:950;line-height:1;white-space:nowrap}.hockey-line-role.is-goalkeeper{color:#ffe5a5;border-color:rgba(255,190,70,.38);background:rgba(255,190,70,.13)}.hockey-line-role.is-defender{color:#a9d4ff;border-color:rgba(82,162,255,.38);background:rgba(82,162,255,.13)}.hockey-line-role.is-forward{color:#aef2c7;border-color:rgba(67,211,123,.38);background:rgba(67,211,123,.13)} .hockey-line-order{display:grid;place-items:center;width:22px;height:22px;border:1px solid rgba(84,229,196,.34);border-radius:999px;color:#07130f;background:#54e5c4;font-size:9px;font-weight:950;font-variant-numeric:tabular-nums} -.hockey-line-card.is-unassigned .hockey-line-player{grid-template-columns:10px 30px minmax(0,1fr)} +.hockey-line-card.is-unassigned .hockey-line-player{grid-template-columns:10px 30px minmax(0,1fr) auto} .hockey-lines-empty{position:absolute;inset:0;display:grid;place-content:center;gap:6px;color:#7890a8;text-align:center}.hockey-lines-empty strong{color:#d9e8f6;font-size:17px}.hockey-lines-empty span{font-size:9px}