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

добавил в веб-интерфейс отображение рядом с номером игра фото, если фотографии у игрока нет

Browse Source
This commit is contained in:
Юрий Черненко
2026-06-22 15:52:47 +03:00
parent f63061a06d
commit 3e6f767a12
7 changed files with 147 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
services/vmix_json_service.py
View File

@@ -469,7 +469,48 @@ def get_vmix_team_formations(session_token: str, team_id: int):
mf.team_id,
COALESCE(mf.player_name, '') AS player_name
FROM match_formations mf
LEFT JOIN players p ON p.id = mf.player_id
LEFT JOIN LATERAL (
SELECT p.*
FROM players p
WHERE p.team_id = mf.team_id
AND (
p.id = mf.player_id
OR (
COALESCE(p.number::text, '') <> ''
AND COALESCE(p.number::text, '') = COALESCE(mf.number, '')
)
OR (
COALESCE(mf.player_name, '') <> ''
AND (
LOWER(COALESCE(p.full_name, '')) = LOWER(TRIM(mf.player_name))
OR LOWER(TRIM(COALESCE(p.last_name, '') || ' ' || COALESCE(p.first_name, ''))) = LOWER(TRIM(mf.player_name))
OR LOWER(TRIM(COALESCE(p.first_name, '') || ' ' || COALESCE(p.last_name, ''))) = LOWER(TRIM(mf.player_name))
)
)
)
ORDER BY
CASE
WHEN p.id = mf.player_id
AND (
COALESCE(mf.number, '') = ''
OR COALESCE(p.number::text, '') = COALESCE(mf.number, '')
OR LOWER(COALESCE(p.full_name, '')) = LOWER(TRIM(COALESCE(mf.player_name, '')))
OR LOWER(TRIM(COALESCE(p.last_name, '') || ' ' || COALESCE(p.first_name, ''))) = LOWER(TRIM(COALESCE(mf.player_name, '')))
OR LOWER(TRIM(COALESCE(p.first_name, '') || ' ' || COALESCE(p.last_name, ''))) = LOWER(TRIM(COALESCE(mf.player_name, '')))
)
THEN 0
WHEN COALESCE(p.number::text, '') = COALESCE(mf.number, '')
AND COALESCE(mf.player_name, '') <> ''
THEN 1
WHEN COALESCE(mf.player_name, '') <> ''
THEN 2
WHEN COALESCE(p.number::text, '') = COALESCE(mf.number, '')
THEN 3
ELSE 4
END,
p.id
LIMIT 1
) p ON TRUE
WHERE mf.match_id = %s and mf.team_id = %s
ORDER BY mf.id
"""