Skip to content

Results with color #16830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 22, 2025
Merged

Results with color #16830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
133b477
Results with color
SergioGlorias Jan 21, 2025
53ebedc
Merge branch 'master' into results-with-color
SergioGlorias Jan 21, 2025
34e81dd
Merge branch 'master' into results-with-color
ornicar Jan 22, 2025
4ff3c23
refactor ui study resultTag
ornicar Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions ui/analyse/src/study/multiBoard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { h } from 'snabbdom';
import { storage, storedBooleanProp } from 'common/storage';
import { Chessground as makeChessground } from 'chessground';
import { EMPTY_BOARD_FEN } from 'chessops/fen';
import { resultTag } from './studyView';

export class MultiBoardCtrl {
playing: Toggle;
Expand Down Expand Up @@ -321,11 +322,15 @@ const computeTimeLeft = (preview: ChapterPreview, color: Color): number | undefi
};

const boardPlayer = (preview: ChapterPreview, color: Color, showResults?: boolean) => {
const outcome = preview.status && preview.status !== '*' ? preview.status : undefined;
const player = preview.players?.[color],
const outcome = preview.status && preview.status !== '*' ? preview.status : undefined,
player = preview.players?.[color],
score = outcome?.split('-')[color === 'white' ? 0 : 1];
return h('span.mini-game__player', [
player && renderUser(player),
showResults ? (score ? h('span.mini-game__result', score) : renderClock(preview, color)) : undefined,
showResults
? score
? h(`${resultTag(score)}.mini-game__result`, score)
: renderClock(preview, color)
: undefined,
]);
};
11 changes: 6 additions & 5 deletions ui/analyse/src/study/playerBars.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import RelayPlayers, { fidePageLinkAttrs } from './relay/relayPlayers';
import { StudyCtrl } from './studyDeps';
import { intersection } from 'tree/path';
import { defined } from 'common';
import { resultTag } from './studyView';

export default function (ctrl: AnalyseCtrl): VNode[] | undefined {
const study = ctrl.study;
Expand Down Expand Up @@ -57,18 +58,18 @@ function renderPlayer(
relayPlayers?: RelayPlayers,
): VNode {
const showResult: boolean =
!defined(ctrl.study?.relay) ||
ctrl.study?.multiBoard.showResults() ||
ctrl.node.ply == ctrl.tree.lastPly();
const player = players?.[color],
!defined(ctrl.study?.relay) ||
ctrl.study?.multiBoard.showResults() ||
ctrl.node.ply == ctrl.tree.lastPly(),
player = players?.[color],
fideId = parseInt(findTag(tags, `${color}fideid`) || ''),
team = findTag(tags, `${color}team`),
rating = showRatings && player?.rating,
result = showResult && resultOf(tags, color === 'white'),
top = ctrl.bottomColor() !== color;
return h(`div.study__player.study__player-${top ? 'top' : 'bot'}`, { class: { ticking } }, [
h('div.left', [
result && h('span.result', result),
result && h(`${resultTag(result)}.result`, result),
h('span.info', [
team ? h('span.team', team) : undefined,
playerFed(player?.fed),
Expand Down
3 changes: 2 additions & 1 deletion ui/analyse/src/study/relay/relayGames.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import type { ChapterPreview } from '../interfaces';
import { gameLinkAttrs } from '../studyChapters';
import { playerFed } from '../playerBars';
import { h } from 'snabbdom';
import { resultTag } from '../studyView';

export const gamesList = (study: StudyCtrl, relay: RelayCtrl) => {
const chapters = study.chapters.list.all();
Expand Down Expand Up @@ -59,7 +60,7 @@ export const gamesList = (study: StudyCtrl, relay: RelayCtrl) => {
playerFed(p.fed),
h('span.name', [userTitle(p), p.name]),
]),
showResults ? h(s === '1' ? 'good' : s === '0' ? 'bad' : 'status', [s]) : null,
showResults ? h(resultTag(s), [s]) : null,
]
: [h('span.mini-game__user', h('span.name', 'Unknown player'))],
);
Expand Down
2 changes: 2 additions & 0 deletions ui/analyse/src/study/studyView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,3 +270,5 @@ export function underboard(ctrl: AnalyseCtrl): MaybeVNodes {
}
return [notifView(study.notif), descView(study, true), descView(study, false), buttons(ctrl), panel];
}

export const resultTag = (s: any) => (s === '1' ? 'good' : s === '0' ? 'bad' : 'status');
Loading