Skip to content
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.

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

List tab display Point Status grouped by 100 points #1430

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
52 changes: 44 additions & 8 deletions atcoder-problems-frontend/src/pages/ListPage/SmallTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { useMergedProblemMap } from "../../api/APIClient";

interface Props {
submissions: Submission[];
setFilterFunc: (point: number) => void;
setFilterFunc: (from: number, to: number) => void;
}

export const getTotalCount = (
Expand Down Expand Up @@ -51,25 +51,60 @@ export const SmallTable: React.FC<Props> = ({ submissions, setFilterFunc }) => {
useMergedProblemMap().data ?? new Map<ProblemId, MergedProblem>();
const userPointCountMap = getUserPointCounts(mergedProblemMap, submissions);
const totalCount = getTotalCount(mergedProblemMap);
const totalCountBy100 = totalCount.reduce(
(
ret: { point: number; count: number }[],
current: { point: number; count: number }
) => {
const roundedPoint = Math.floor(current.point / 100) * 100;
const prev = ret.find((entry) => entry.point === roundedPoint);
if (prev) {
prev.count += current.count;
} else {
ret.push({ point: roundedPoint, count: current.count });
}
return ret;
},
[]
);

const getUserPointCountInArea = (
countByPoint: Map<number | null | undefined, number>,
pointStart: number,
pointEnd: number
) => {
let ret = 0;
for (let i = 0; i < totalCount.length; i++) {
if (totalCount[i].point < pointStart) {
continue;
}
if (totalCount[i].point >= pointEnd) {
break;
}
ret += countByPoint.get(totalCount[i].point) ?? 0;
}
return ret;
};

return (
<Table striped bordered hover responsive>
<thead>
<tr>
<th>Point</th>
{totalCount.map(({ point }) => (
{totalCountBy100.map(({ point }) => (
<th key={point}>
<a
href={window.location.hash}
onClick={(): void => setFilterFunc(point)}
onClick={(): void => setFilterFunc(point, point + 99)}
>
{point}
{`${point}-`}
</a>
</th>
))}
</tr>
<tr>
<th>Total</th>
{totalCount.map(({ point, count }) => (
{totalCountBy100.map(({ point, count }) => (
<th key={point}>{count}</th>
))}
</tr>
Expand All @@ -78,16 +113,17 @@ export const SmallTable: React.FC<Props> = ({ submissions, setFilterFunc }) => {
{userPointCountMap.map(({ userId, countByPoint }) => (
<tr key={userId}>
<td>{userId}</td>
{totalCount.map(({ point, count }) => (
{totalCountBy100.map(({ point, count }) => (
<td
key={point}
className={
countByPoint.get(point) === count
getUserPointCountInArea(countByPoint, point, point + 100) ===
count
? TableColor.Success
: TableColor.None
}
>
{countByPoint.get(point) ?? 0}
{getUserPointCountInArea(countByPoint, point, point + 100) ?? 0}
</td>
))}
</tr>
Expand Down
9 changes: 5 additions & 4 deletions atcoder-problems-frontend/src/pages/ListPage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,13 @@ export const ListPage: React.FC<Props> = (props) => {
const submissions = useMultipleUserSubmissions(users).data ?? [];
const progressReset = useProgressResetList().data;

const setExactPointFilter = (point: number): void => {
const setPointFilter = (from: number, to: number): void => {
const params = new URLSearchParams(location.search);
params.set(FilterParams.FromPoint, point.toString());
params.set(FilterParams.ToPoint, point.toString());
params.set(FilterParams.FromPoint, from.toString());
params.set(FilterParams.ToPoint, to.toString());
history.push({ ...location, search: params.toString() });
};

const setDifficultyFilter = (from: number, to: number): void => {
const params = new URLSearchParams(location.search);
params.set(FilterParams.FromDifficulty, from.toString());
Expand All @@ -53,7 +54,7 @@ export const ListPage: React.FC<Props> = (props) => {
<Row>
<SmallTable
submissions={filteredSubmissions}
setFilterFunc={setExactPointFilter}
setFilterFunc={setPointFilter}
/>
</Row>

Expand Down