diff --git a/components/Container.tsx b/components/Container.tsx
index e3c29d1c..0cc63f42 100644
--- a/components/Container.tsx
+++ b/components/Container.tsx
@@ -22,6 +22,7 @@ import Banner, { DiscordBanner } from "./Banner";
import { stat } from "fs";
import { forceOfflineMode } from "@/lib/client/ClientUtils";
import Head from "next/head";
+import SignInMenu from "./SignInMenu";
const api = new ClientApi();
@@ -253,23 +254,7 @@ export default function Container(props: ContainerProps) {
{showAuthBlock ? (
-
-
+
-
-
-
- Wait a minute...
-You need to sign in first!
-
-
-
-
-
-
+
+ );
+}
+
+export default function SignInMenu() {
+ return (
+
+
+ Sign In
+ {error &&{error}
} +Choose a login provider
+ + + + + + + +
+
+ Email Sign In
+ + +
+
+
@@ -391,12 +420,19 @@ export default function InsightsAndSettingsCard(props: {
)}
-
+
+
+
) : (
diff --git a/components/competition/MatchScheduleCard.tsx b/components/competition/MatchScheduleCard.tsx
index 87837ec8..5e3a5bbc 100644
--- a/components/competition/MatchScheduleCard.tsx
+++ b/components/competition/MatchScheduleCard.tsx
@@ -188,7 +188,7 @@ export default function MatchScheduleCard(props: {
@@ -227,7 +227,7 @@ export default function MatchScheduleCard(props: {
})}
+
{match.subjectiveScouter &&
usersById[match.subjectiveScouter] ? (
Add Subjective Report (
diff --git a/components/competition/PitScoutingCard.tsx b/components/competition/PitScoutingCard.tsx
index 79c87ca2..87cf61e7 100644
--- a/components/competition/PitScoutingCard.tsx
+++ b/components/competition/PitScoutingCard.tsx
@@ -2,7 +2,7 @@ import { NotLinkedToTba } from "@/lib/client/ClientUtils";
import { Competition, Pitreport } from "@/lib/Types";
import Link from "next/link";
import { BsGearFill } from "react-icons/bs";
-import { FaRobot } from "react-icons/fa";
+import { FaCheck, FaRobot } from "react-icons/fa";
export default function PitScoutingCard(props: {
pitreports: Pitreport[];
@@ -49,13 +49,14 @@ export default function PitScoutingCard(props: {
@@ -267,30 +267,32 @@ export default function MatchScheduleCard(props: {
) : (
) : (
-
Subjective Scouter:{" "}
- {usersById[match.subjectiveScouter ?? ""].name}{" "}
-
)}
-
+ {
+ usersById[match.subjectiveScouter ?? ""].name
+ }{" "}
- No subjective scouter assigned{" "}
-
+
-
- No subjective scouter assigned
)}
+
+
{report.submitted ? (
- 
+ //
+ ;
+ }>
+ >(new Set());
- const [datapoints, setDataPoints] = useState(null);
const [currentTeam, setCurrentTeam] = useState(0);
function dataToNumber(key: string, data: any): number {
if (key === "Defense") {
- let n = 0;
switch (data) {
case Defense.None:
return 0;
@@ -85,18 +86,31 @@ export default function SmallGraph(props: {
case Defense.Full:
return 1;
}
+ } else if (key === "EndgameClimbStatus") {
+ switch (data) {
+ case ReefscapeEnums.EndgameClimbStatus.None:
+ return 0;
+ case ReefscapeEnums.EndgameClimbStatus.Park:
+ return 0.33;
+ case ReefscapeEnums.EndgameClimbStatus.High:
+ return 0.66;
+ case ReefscapeEnums.EndgameClimbStatus.Low:
+ return 1;
+ }
}
return data;
}
+ const datasetArr = Array.from(dataset);
+
const data = {
- labels: datapoints?.map((point) => point.x) ?? [],
+ labels: removeDuplicates(
+ datasetArr.map((point) => point.matchNumber) ?? [],
+ ),
datasets: [
{
label: key,
- data: props.selectedReports?.map((report) =>
- dataToNumber(key, report.data[key]),
- ),
+ data: datasetArr.map((report) => dataToNumber(key, report.data[key])),
backgroundColor: "rgba(255, 99, 132, 0.5)",
},
],
@@ -105,23 +119,27 @@ export default function SmallGraph(props: {
useEffect(() => {
if (!props.selectedReports) return;
- setDataPoints([]);
setCurrentTeam(props.team);
- for (const report of props.selectedReports) {
- api.findMatchById(report.match).then((match) => {
+
+ const newDataset: typeof dataset = new Set();
+
+ Promise.all(
+ props.selectedReports.map(async (report) => {
+ const match = await api.findMatchById(report.match);
if (!match) return;
- setDataPoints((prev) =>
- [
- ...(prev ?? []),
- {
- x: match.number,
- y: dataToNumber(key, report.data[key]),
- },
- ].sort((a, b) => a.x - b.x),
- );
- });
- }
+ newDataset.add({
+ matchNumber: match.number,
+ data: report.data,
+ });
+ }),
+ ).then(() =>
+ setDataset(
+ new Set(
+ Array.from(newDataset).sort((a, b) => a.matchNumber - b.matchNumber),
+ ),
+ ),
+ );
}, [key, currentTeam, props.selectedReports, props.team]);
if (!props.selectedReports) {
@@ -151,10 +169,7 @@ export default function SmallGraph(props: {
point.x) ?? [],
- }}
+ data={data}
/>
);
diff --git a/lib/CompetitionHandling.ts b/lib/CompetitionHandling.ts
index e8720aa6..8ea481b5 100644
--- a/lib/CompetitionHandling.ts
+++ b/lib/CompetitionHandling.ts
@@ -15,6 +15,8 @@ import { games } from "./games";
import { GameId } from "./client/GameId";
import CollectionId from "./client/CollectionId";
import DbInterface from "./client/dbinterfaces/DbInterface";
+import { _id } from "@next-auth/mongodb-adapter";
+import { match } from "assert";
type ScheduleMatch = {
subjectiveScouter?: string;
@@ -85,12 +87,16 @@ export async function assignScoutersToCompetitionMatches(
games[comp.gameId].league == League.FRC ? 6 : 4,
);
+ const matches = await db.findObjects(CollectionId.Matches, {
+ _id: { $in: comp.matches.map((m) => new ObjectId(m)) },
+ });
+
+ matches.sort((a, b) => a.number - b.number);
+
const promises: Promise- {stat.label}: {stat.value}{" "} + {stat.label}:{" "} + {Round(stat.value)}{" "} (Ranked #{stat.rank}/{stat.maxRanking}) @@ -189,12 +191,16 @@ function TeamSlide(props: {