From d44baaaa960dc1a0ffec9c7927a4f4de573c2530 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Gl=C3=B3rias?= Date: Tue, 2 Jul 2024 23:22:26 +0000 Subject: [PATCH 1/2] Broadcast teams: White is first --- ui/analyse/src/study/relay/relayTeams.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ui/analyse/src/study/relay/relayTeams.ts b/ui/analyse/src/study/relay/relayTeams.ts index f2246414ce28..8c6190f1ed6d 100644 --- a/ui/analyse/src/study/relay/relayTeams.ts +++ b/ui/analyse/src/study/relay/relayTeams.ts @@ -70,16 +70,17 @@ const renderTeams = ( cloudEval?: MultiCloudEval, ): MaybeVNodes => teams.table.map(row => { - const firstTeam = row.teams[0]; + const firstTeam = row.teams[1]; + const secondTeam = row.teams[0] return h('div.relay-tour__team-match', [ h('div.relay-tour__team-match__teams', [ - h('strong.relay-tour__team-match__team', row.teams[0].name), + h('strong.relay-tour__team-match__team', firstTeam.name), h('span.relay-tour__team-match__team__points', [ h('points', firstTeam.points.toString()), h('vs', 'vs'), - h('points', row.teams[1].points.toString()), + h('points', secondTeam.points.toString()), ]), - h('strong.relay-tour__team', row.teams[1].name), + h('strong.relay-tour__team', secondTeam.name), ]), h( 'div.relay-tour__team-match__games', @@ -88,7 +89,7 @@ const renderTeams = ( const players = chap?.players; if (!players) return; const sortedPlayers = - game.pov == 'white' ? [players.white, players.black] : [players.black, players.white]; + game.pov == 'white' ? [players.black, players.white] : [players.white, players.black]; return ( chap && h('a.relay-tour__team-match__game', { attrs: gameLinkAttrs(basePath, chap) }, [ @@ -109,7 +110,7 @@ const playerView = (p: ChapterPreviewPlayer) => ]); const statusView = (g: ChapterPreview, pov: Color, chapters: StudyChapters, cloudEval?: MultiCloudEval) => { - const status = pov == 'white' ? g.status : (g.status?.split('').reverse().join('') as StatusStr); + const status = pov == 'white' ? (g.status?.split('').reverse().join('') as StatusStr) : g.status; return h( 'span.relay-tour__team-match__game__status', status && status != '*' ? status : cloudEval ? evalGauge(g, pov, chapters, cloudEval) : '*', From 6e75f04e4d971b3dd8be631f688d7449d94052ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Gl=C3=B3rias?= Date: Tue, 2 Jul 2024 23:25:55 +0000 Subject: [PATCH 2/2] format --- ui/analyse/src/study/relay/relayTeams.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/analyse/src/study/relay/relayTeams.ts b/ui/analyse/src/study/relay/relayTeams.ts index 8c6190f1ed6d..b02851ba6304 100644 --- a/ui/analyse/src/study/relay/relayTeams.ts +++ b/ui/analyse/src/study/relay/relayTeams.ts @@ -71,7 +71,7 @@ const renderTeams = ( ): MaybeVNodes => teams.table.map(row => { const firstTeam = row.teams[1]; - const secondTeam = row.teams[0] + const secondTeam = row.teams[0]; return h('div.relay-tour__team-match', [ h('div.relay-tour__team-match__teams', [ h('strong.relay-tour__team-match__team', firstTeam.name),