Skip to content

Fix sorting of match graph #14

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Fix sorting of match graph #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a1e6a8b
Fix bug: sort matches graph by time
Meng87 Jan 28, 2024
11d7c82
fix more build errors
Meng87 Jan 28, 2024
b6dd581
Merge branch 'main' of https://github.com/acm-cmu/awap-dashboard-2024…
Meng87 Jan 28, 2024
e5354c7
fix player ordering
Meng87 Jan 28, 2024
95f79b5
fix build errors
Meng87 Jan 28, 2024
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
15 changes: 11 additions & 4 deletions src/pages/admin/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,13 +225,19 @@ const Admin: NextPage = () => {
modifyCodeSubmissions(false);
};

const aggregateMatchesByMinute = (matches: Match[]) => {
if (!matches) {
const aggregateMatchesByMinute = (matchArr: Match[]) => {
if (!matchArr) {
return [];
}
const matchesProcessed = matchArr
.map((elem) => ({
timestamp: new Date(elem.timestamp),
}))
.sort((a, b) => (a.timestamp > b.timestamp ? 1 : -1));

const aggregatedData: { [id: string]: number } = {};
matches.forEach((item: Match) => {
const minute = new Date(item.timestamp).toLocaleString('en-US', {
matchesProcessed.forEach((item) => {
const minute = item.timestamp.toLocaleString('en-US', {
month: 'numeric',
day: 'numeric',
hour: 'numeric',
Expand All @@ -248,6 +254,7 @@ const Admin: NextPage = () => {
time,
matches: aggregatedData[time],
}));

return chartData;
};

Expand Down
17 changes: 11 additions & 6 deletions src/pages/api/admin/admin-match-history.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,18 @@ function processData(items: Record<string, AttributeValue>[] | undefined) {

const procItems = items.map((item: Record<string, AttributeValue>) => ({
id: item.match_id ? item.match_id.N?.toString() : '-1',
player1:
item.players && item.players.L && item.players.L[0] && item.players.L[0].M
? item.players.L[0].M.teamName.S
: 'unknown',
player1: item.sk ? item.sk.S?.slice(5) : 'unknown',
/* eslint-disable no-nested-ternary */
player2:
item.players && item.players.L && item.players.L[1] && item.players.L[1].M
? item.players.L[1].M.teamName.S
item.players &&
item.players.L &&
item.players.L[0] &&
item.players.L[0].M &&
item.players.L[1] &&
item.players.L[1].M
? item.players.L[0].M.current.BOOL
? item.players.L[1].M.teamName.S
: item.players.L[0].M.teamName.S
: 'unknown',
category: item.category ? item.category.S : 'unknown',
map: item.map && item.map.S ? item.map.S : 'unknown',
Expand Down