Merge branch 'alliances' of https://github.com/Decatur-Robotics/Gearbox…

… into alliances

components/forms/Form.tsx

@@ -188,7 +188,7 @@ export default function Form(props: FormProps) {
 
 		const elements = [];
 
-		// console.log(`Block: ${rowCount}x${colCount}: ${block.flat().map(e => e.key).join(", ")}`);
+		//console.log(`Block: ${rowCount}x${colCount}: ${block.flat().map(e => e.key).join(", ")}`);
 		for (let r = 0; r < rowCount; r++) {
 			for (let c = 0; c < colCount; c++) {
 				let topRounding = "",

components/stats/SmallGraph.tsx

@@ -103,11 +103,7 @@ export default function SmallGraph(props: {
 	};
 
 	useEffect(() => {
-		if (
-			!props.selectedReports ||
-			(datapoints && currentTeam === props.team && false)
-		)
-			return;
+		if (!props.selectedReports) return;
 
 		setDataPoints([]);
 		setCurrentTeam(props.team);
@@ -126,7 +122,7 @@ export default function SmallGraph(props: {
 				);
 			});
 		}
-	}, [key, currentTeam, datapoints, props.selectedReports, props.team]);
+	}, [key, currentTeam, props.selectedReports, props.team]);
 
 	if (!props.selectedReports) {
 		return <></>;
@@ -141,13 +137,9 @@ export default function SmallGraph(props: {
 					console.log(e.target.value);
 					setKey(e.target.value);
 				}}
+				defaultValue={"selected"}
 			>
-				<option
-					disabled
-					selected
-				>
-					Select Variable
-				</option>
+				<option disabled>Select Variable</option>
 				{keys.map((key) => (
 					<option
 						key={key}

lib/Enums.ts

@@ -81,3 +81,31 @@ export namespace IntoTheDeepEnums {
 		HighLevelClimb = "High Level Climb",
 	}
 }
+
+export namespace ReefscapeEnums {
+	export enum EndgameClimbStatus {
+		None = "None",
+		Park = "Park",
+		High = "High",
+		Low = "Low",
+	}
+
+	export enum DriveThroughDeepCage {
+		No = "No",
+		Slow = "Slow",
+		Fast = "Fast",
+	}
+
+	export enum AutoCapabilities {
+		NoAuto = "No Auto",
+		MovePastStart = "Move Past Start",
+		ScoreOneCoral = "Score One Coral",
+		ScoreMoreThanOneCoral = "ScoreMoreThanOneCoral",
+	}
+
+	export enum Climbing {
+		No = "No",
+		Deep = "Deep",
+		Shallow = "Shallow",
+	}
+}

lib/Layout.ts

@@ -9,6 +9,7 @@ import {
 	CenterStageEnums,
 	IntoTheDeepEnums,
 	FtcDrivetrain,
+	ReefscapeEnums,
 } from "./Enums";
 import { PitReportData, QuantData, Pitreport, Report, League } from "./Types";
 
@@ -143,6 +144,14 @@ export type StatPair<
 	label: string;
 };
 
+export type StatGroup<
+	TPitData extends PitReportData,
+	TQuantData extends QuantData,
+> = {
+	stats: Stat<TPitData, TQuantData>[];
+	label: string;
+};
+
 export type StatsLayout<
 	TPitData extends PitReportData,
 	TQuantData extends QuantData,
@@ -204,6 +213,10 @@ export function keyToType(
 		CenterStageEnums.AutoSidePreference,
 		IntoTheDeepEnums.StartedWith,
 		IntoTheDeepEnums.EndgameLevelClimbed,
+		ReefscapeEnums.AutoCapabilities,
+		ReefscapeEnums.Climbing,
+		ReefscapeEnums.DriveThroughDeepCage,
+		ReefscapeEnums.EndgameClimbStatus,
 	];
 
 	if (key === "Defense") return Defense;
@@ -213,6 +226,11 @@ export function keyToType(
 	if (key === "EndgameLevelClimbed")
 		return IntoTheDeepEnums.EndgameLevelClimbed;
 
+	if (key == "AutoCapabilities") return ReefscapeEnums.AutoCapabilities;
+	if (key == "Climbing") return ReefscapeEnums.Climbing;
+	if (key == "DriveThroughDeepCage") return ReefscapeEnums.DriveThroughDeepCage;
+	if (key == "EndgameClimbStatus") return ReefscapeEnums.EndgameClimbStatus;
+
 	for (const e of enums) {
 		if (Object.values(e).includes(exampleData[key])) return e;
 	}

lib/Types.ts

@@ -174,6 +174,7 @@ export class Game<
 
 	fieldImagePrefix: string;
 	coverImage: string;
+	coverImageClass: string;
 
 	getBadges: (
 		pitData: Pitreport<TPitData> | undefined,
@@ -204,6 +205,7 @@ export class Game<
 		pitStatsLayout: PitStatsLayout<TPitData, TQuantData>,
 		fieldImagePrefix: string,
 		coverImage: string,
+		coverImageClass: string | undefined,
 		getBadges: (
 			pitData: Pitreport<TPitData> | undefined,
 			quantitativeReports: Report<TQuantData>[] | undefined,
@@ -237,6 +239,7 @@ export class Game<
 
 		this.fieldImagePrefix = fieldImagePrefix;
 		this.coverImage = coverImage;
+		this.coverImageClass = coverImageClass ?? "";
 
 		this.getBadges = getBadges;
 		this.getAvgPoints = getAvgPoints;

lib/api/ClientApi.ts

@@ -908,7 +908,7 @@ export default class ClientApi extends NextApiTemplate<ApiDependencies> {
 		isAuthorized: AccessLevels.AlwaysAuthorized,
 		handler: async (req, res, { tba }, authData, [tbaId]) => {
 			const compRankings = await tba.req.getCompetitonRanking(tbaId);
-			return res.status(200).send(compRankings.rankings);
+			return res.status(200).send(compRankings?.rankings);
 		},
 	});
 

lib/client/GameId.ts

@@ -2,6 +2,7 @@ export enum GameId {
 	Crescendo = "Crescendo",
 	CenterStage = "CenterStage",
 	IntoTheDeep = "IntoTheDeep",
+	Reefscape = "Reefscape",
 }
 
 export const defaultGameId = GameId.Crescendo;

lib/client/StatsMath.ts

@@ -118,3 +118,31 @@ export function ComparativePercent<T extends QuantData>(
 
 	return Round((a / (b + a)) * 100) + "%";
 }
+
+/**
+ * @tested_by tests/lib/client/StatsMath.test.ts
+ */
+export function ComparativePercentMulti<T extends QuantData>(
+	selectors: Selector<T>[],
+	reports: Report<T>[],
+) {
+	const results: string[] = [];
+	const totals = selectors.map((selectors) =>
+		NumericalTotal(selectors, reports),
+	);
+
+	let sum = 0;
+	for (let i = 0; i < totals.length; i++) {
+		sum += totals[i];
+	}
+
+	for (let i = 0; i < totals.length; i++) {
+		results.push(Round((totals[i] / sum) * 100) + "%");
+	}
+
+	if (sum === 0) {
+		return 0;
+	}
+
+	return results;
+}

lib/client/useInterval.ts

@@ -1,19 +1,23 @@
-import { useEffect, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 
 /**
  * Can be janky. You've been warned.
  */
+
 export default function useInterval(
 	func: () => any,
 	interval: number,
 	deps: any[] = [],
 ) {
-	const [id, setId] = useState<NodeJS.Timeout | undefined>(undefined);
+	const [id, setId] = useState<NodeJS.Timeout>();
+	const callback = useCallback(func, [func, ...deps]);
 
 	useEffect(() => {
-		setId(setInterval(func, interval));
-		return () => clearInterval(id);
-	}, [func.name, interval, func, id, deps]);
+		console.log("Setting interval", interval);
+		const newInterval = setInterval(callback, interval);
+		setId(newInterval);
+		return () => clearInterval(newInterval);
+	}, [interval, callback]);
 
 	return id;
 }