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

тест6

Browse Source
This commit is contained in:
Юрий Черненко
2026-04-21 15:51:08 +03:00
parent 8c40687942
commit af17b088cf
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
repositories/match_formation_repository.py
View File

@@ -153,7 +153,8 @@ def get_match_formations(match_id: int, team_id: int) -> list[dict]:
mf.is_captain, mf.is_captain,
mf.x, mf.x,
mf.y, mf.y,
p.last_name p.last_name,
p.position as position_full
FROM match_formations mf FROM match_formations mf
LEFT JOIN players p ON p.id = mf.player_id LEFT JOIN players p ON p.id = mf.player_id
WHERE mf.match_id = %s WHERE mf.match_id = %s
@@ -174,6 +175,7 @@ def get_match_formations(match_id: int, team_id: int) -> list[dict]:
"x": float(row[5]), "x": float(row[5]),
"y": float(row[6]), "y": float(row[6]),
"last_name": row[7] or "", "last_name": row[7] or "",
"position_full": row[8] or "",
} }
for row in rows for row in rows
] ]

2
static/script.js
View File

@@ -2098,7 +2098,7 @@ function renderLineupRow(row) {
data-vmix-person-type="player" data-vmix-person-type="player"
data-side="${escapeHtml(side)}" data-side="${escapeHtml(side)}"
data-name="${escapeHtml(displayName)}" data-name="${escapeHtml(displayName)}"
data-role="${escapeHtml(player.position || "")}" data-role="${escapeHtml(player.positionFull || player.position || "")}"
> >
<div class="player-inline"> <div class="player-inline">
<div class="player-inline-text"> <div class="player-inline-text">

10
templates/match_workspace.html
View File

@@ -355,7 +355,7 @@
data-vmix-person-type="player" data-vmix-person-type="player"
data-side="home" data-side="home"
data-name="{{ ((p.last_name or p.player_name or '') ~ ' ' ~ (p.first_name or '')) | trim }}" data-name="{{ ((p.last_name or p.player_name or '') ~ ' ' ~ (p.first_name or '')) | trim }}"
data-role="{{ p.pos or '' }}" data-role="{{ p.position_full or p.position or '' }}"
> >
<div class="player-inline-text"> <div class="player-inline-text">
<span class="last-name">{{ p.last_name or p.player_name }}</span> <span class="last-name">{{ p.last_name or p.player_name }}</span>
@@ -462,7 +462,7 @@
data-vmix-person-type="player" data-vmix-person-type="player"
data-side="home" data-side="home"
data-name="{{ ((p.last_name or p.player_name or '') ~ ' ' ~ (p.first_name or '')) | trim }}" data-name="{{ ((p.last_name or p.player_name or '') ~ ' ' ~ (p.first_name or '')) | trim }}"
data-role="{{ p.pos or '' }}" data-role="{{ p.position_full or p.position or '' }}"
> >
<div class="player-inline-text"> <div class="player-inline-text">
<span class="last-name">{{ p.last_name or p.player_name }}</span> <span class="last-name">{{ p.last_name or p.player_name }}</span>
@@ -579,7 +579,7 @@
data-vmix-person-type="player" data-vmix-person-type="player"
data-side="away" data-side="away"
data-name="{{ ((p.last_name or p.player_name or '') ~ ' ' ~ (p.first_name or '')) | trim }}" data-name="{{ ((p.last_name or p.player_name or '') ~ ' ' ~ (p.first_name or '')) | trim }}"
data-role="{{ p.pos or '' }}" data-role="{{ p.position_full or p.position or '' }}"
> >
<div class="player-inline-text"> <div class="player-inline-text">
<span class="last-name">{{ p.last_name or p.player_name }}</span> <span class="last-name">{{ p.last_name or p.player_name }}</span>
@@ -686,7 +686,7 @@
data-vmix-person-type="player" data-vmix-person-type="player"
data-side="away" data-side="away"
data-name="{{ ((p.last_name or p.player_name or '') ~ ' ' ~ (p.first_name or '')) | trim }}" data-name="{{ ((p.last_name or p.player_name or '') ~ ' ' ~ (p.first_name or '')) | trim }}"
data-role="{{ p.position or '' }}" data-role="{{ p.position_full or p.position or '' }}"
> >
<div class="player-inline-text"> <div class="player-inline-text">
<span class="last-name">{{ p.last_name or p.player_name }}</span> <span class="last-name">{{ p.last_name or p.player_name }}</span>
@@ -1317,7 +1317,7 @@
if (!rawName) return; if (!rawName) return;
const formattedName = swapNameParts(rawName); const formattedName = rawName;
sendNeutralPersonTitle(formattedName, role, logoUrl); sendNeutralPersonTitle(formattedName, role, logoUrl);
}); });