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

test9

Browse Source
This commit is contained in:
Юрий Черненко
2026-04-21 16:22:14 +03:00
parent fff2e909f8
commit 6b1dfe9cb4
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
repositories/match_lineup_repository.py
View File

@@ -58,7 +58,7 @@ def _player_to_editor_dict(p: dict) -> dict:
"first_name": p.get("first_name", "") or "",
"number": str(p.get("number", "") or ""),
"position": p.get("position", "") or "",
"position_full": p.get("position_full", "") or p.get("position", "") or "",
"position_full": p.get("position_full", "") or "",
"is_captain": bool(p.get("is_captain")),
}

8
static/script.js
View File

@@ -2038,12 +2038,8 @@ function renderLineupRow(row) {
const role = row.dataset.role;
const player = getRowPlayer(row);
const fullName = (player.name || `${player.lastName || ""} ${player.firstName || ""}`).trim();
const displayName = buildPersonDisplayName(
player.firstName,
player.lastName,
player.name || fullName
);
const displayName = String(player.name || "").trim()
|| buildPersonDisplayName(player.firstName, player.lastName, "");
const gkBadge = isGoalkeeperPosition(player.position) ? '<span class="gk-badge">ВР</span>' : '';
const captainBadge = player.isCaptain ? '<span class="captain-badge">К</span>' : '';

16
templates/match_workspace.html
View File

@@ -341,7 +341,7 @@
data-side="home"
data-role="starting"
data-player-id="{{ p.player_id | default(p.number) }}"
data-player-name="{{ ((p.last_name or p.player_name or '') ~ ' ' ~ (p.first_name or '')) | trim }}"
data-player-name="{{ p.player_name or '' }}"
data-player-last="{{ p.last_name or p.player_name or '' }}"
data-player-first="{{ p.first_name or '' }}"
data-player-number="{{ p.number or '' }}"
@@ -354,7 +354,7 @@
class="player-inline vmix-person-trigger player-link"
data-vmix-person-type="player"
data-side="home"
data-name="{{ ((p.last_name or p.player_name or '') ~ ' ' ~ (p.first_name or '')) | trim }}"
data-name="{{ p.player_name or '' }}"
data-role="{{ p.position_full or p.position or '' }}"
>
<div class="player-inline-text">
@@ -448,7 +448,7 @@ data-role="{{ p.position_full or p.position or '' }}"
data-side="home"
data-role="bench"
data-player-id="{{ p.player_id | default(p.number) }}"
data-player-name="{{ ((p.last_name or p.player_name or '') ~ ' ' ~ (p.first_name or '')) | trim }}"
data-player-name="{{ p.player_name or '' }}"
data-player-last="{{ p.last_name or p.player_name or '' }}"
data-player-first="{{ p.first_name or '' }}"
data-player-number="{{ p.number or '' }}"
@@ -461,7 +461,7 @@ data-role="{{ p.position_full or p.position or '' }}"
class="player-inline vmix-person-trigger player-link"
data-vmix-person-type="player"
data-side="home"
data-name="{{ ((p.last_name or p.player_name or '') ~ ' ' ~ (p.first_name or '')) | trim }}"
data-name="{{ p.player_name or '' }}"
data-role="{{ p.position_full or p.position or '' }}"
>
<div class="player-inline-text">
@@ -565,7 +565,7 @@ data-role="{{ p.position_full or p.position or '' }}"
data-side="away"
data-role="starting"
data-player-id="{{ p.player_id | default(p.number) }}"
data-player-name="{{ ((p.last_name or p.player_name or '') ~ ' ' ~ (p.first_name or '')) | trim }}"
data-player-name="{{ p.player_name or '' }}"
data-player-last="{{ p.last_name or p.player_name or '' }}"
data-player-first="{{ p.first_name or '' }}"
data-player-number="{{ p.number or '' }}"
@@ -578,7 +578,7 @@ data-role="{{ p.position_full or p.position or '' }}"
class="player-inline vmix-person-trigger player-link"
data-vmix-person-type="player"
data-side="away"
data-name="{{ ((p.last_name or p.player_name or '') ~ ' ' ~ (p.first_name or '')) | trim }}"
data-name="{{ p.player_name or '' }}"
data-role="{{ p.position_full or p.position or '' }}"
>
<div class="player-inline-text">
@@ -672,7 +672,7 @@ data-role="{{ p.position_full or p.position or '' }}"
data-side="away"
data-role="bench"
data-player-id="{{ p.player_id | default(p.number) }}"
data-player-name="{{ ((p.last_name or p.player_name or '') ~ ' ' ~ (p.first_name or '')) | trim }}"
data-player-name="{{ p.player_name or '' }}"
data-player-last="{{ p.last_name or p.player_name or '' }}"
data-player-first="{{ p.first_name or '' }}"
data-player-number="{{ p.number or '' }}"
@@ -685,7 +685,7 @@ data-role="{{ p.position_full or p.position or '' }}"
class="player-inline vmix-person-trigger player-link"
data-vmix-person-type="player"
data-side="away"
data-name="{{ ((p.last_name or p.player_name or '') ~ ' ' ~ (p.first_name or '')) | trim }}"
data-name="{{ p.player_name or '' }}"
data-role="{{ p.position_full or p.position or '' }}"
>
<div class="player-inline-text">