3.1.2

Team3256 · Feb 26, 2024 · 9ff3a11 · 9ff3a11
1 parent 638e2d6
commit 9ff3a11
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 14 deletions.
diff --git a/apps/WarriorHappy/app.json b/apps/WarriorHappy/app.json
@@ -2,7 +2,7 @@
   "expo": {
     "name": "WarriorHappy",
     "slug": "WarriorHappy",
-    "version": "3.1.1",
+    "version": "3.1.2",
     "orientation": "portrait",
     "icon": "./assets/images/icon.png",
     "scheme": "myapp",

diff --git a/apps/WarriorHappy/ios/WarriorHappy/Info.plist b/apps/WarriorHappy/ios/WarriorHappy/Info.plist
@@ -21,7 +21,7 @@
     <key>CFBundlePackageType</key>
     <string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
     <key>CFBundleShortVersionString</key>
-    <string>3.1.1</string>
+    <string>3.1.2</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleURLTypes</key>

diff --git a/apps/WarriorHappy/package.json b/apps/WarriorHappy/package.json
@@ -1,7 +1,7 @@
 {
   "name": "warriorhappy",
   "main": "index.ts",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "scripts": {
     "start": "expo start",
     "android": "expo run:android",

diff --git a/apps/WarriorHappy/src/app/match/Endgame.tsx b/apps/WarriorHappy/src/app/match/Endgame.tsx
@@ -30,10 +30,10 @@ export default function Endgame({
     <View className="mt-5">
       <Text className="pl-3 text-lg">Scoring (Trap=🚪, Hanging=⛓️)</Text>
       <ActionGrid
-        actions={["Miss 🚪", "Miss ⛓️", "Score 🚪", "Score ⛓️"]}
+        actions={["Miss 🚪", "Miss ⛓️", "Score 🚪", "Score ⛓️", "Park"]}
         history={ultimateHistory.log}
         setHistory={setHistory}
-        themeOverrides={["red", "red", "green", "green"]}
+        themeOverrides={["red", "red", "green", "green", "gray"]}
       />
     </View>
   );

diff --git a/apps/WarriorHappy/src/app/match/[matchId].tsx b/apps/WarriorHappy/src/app/match/[matchId].tsx
@@ -33,6 +33,7 @@ export default function Match() {
   const rawUpdate = api.scouting.updateMatchLog.useMutation({
     onSuccess: (data, variables, context) => {
       console.log("data", data, variables, context);
+
       utils.scouting.getMatchLog.setData(key, [variables]);
       //   utils.scouting.getMatchLog.invalidateQuery();
     },
@@ -48,8 +49,8 @@ export default function Match() {
   //     endgame: UltimateHistory;
   //   } | null>(null);
   //   // TODO: Pre-emptively cache
-  const { data, isLoading } = api.scouting.getMatchLog.useQuery(key);
-
+  const { data, isLoading, isError } = api.scouting.getMatchLog.useQuery(key);
+  console.log("daata", data, isError);
   //   const update = useCallback(
   //     (h) => {
   //       rawUpdate.mutate({
@@ -62,8 +63,8 @@ export default function Match() {
   //   );
   //   useEffect(() => {
   //     if (!isLoading) {
-  //       console.log("set", data[0].eventLog);
-  //       setGodlyHistory(data[0].eventLog);
+  //       console.log("set", data[0].event_log);
+  //       setGodlyHistory(data[0].event_log);
   //     }
   //   }, [isLoading]);
   //   // biome-ignore lint/correctness/useExhaustiveDependencies: <explanation>
@@ -79,7 +80,7 @@ export default function Match() {
   // 		</SafeAreaView>
   // 	);
   // }
-  const godlyHistory = data?.[0]?.eventLog as {
+  const godlyHistory = data?.[0]?.event_log as {
     auto: UltimateHistory;
     teleop: UltimateHistory;
     endgame: UltimateHistory;
@@ -111,7 +112,7 @@ export default function Match() {
                 console.log("stuff", stuff);
                 rawUpdate.mutate({
                   ...key,
-                  eventLog: { ...godlyHistory, auto: stuff },
+                  event_log: { ...godlyHistory, auto: stuff },
                 });
               }}
             />
@@ -124,7 +125,7 @@ export default function Match() {
               setUltimateHistory={(stuff) => {
                 rawUpdate.mutate({
                   ...key,
-                  eventLog: { ...godlyHistory, teleop: stuff },
+                  event_log: { ...godlyHistory, teleop: stuff },
                 });
               }}
             />
@@ -136,7 +137,7 @@ export default function Match() {
               setUltimateHistory={(stuff) => {
                 rawUpdate.mutate({
                   ...key,
-                  eventLog: { ...godlyHistory, endgame: stuff },
+                  event_log: { ...godlyHistory, endgame: stuff },
                 });
               }}
             />

diff --git a/packages/api/src/router/scouting.ts b/packages/api/src/router/scouting.ts
@@ -72,7 +72,7 @@ export const scoutingRouter = createTRPCRouter({
 						// biome-ignore lint/style/noNonNullAssertion: The match should be guaranteed to map to a singular event
 						eventKey: x.matches!.event,
 						// biome-ignore lint/style/noNonNullAssertion: see above
-						eventName: "x.matches!.events![0]!.name",
+						eventName: x.matches!.events[0].name,
 						// biome-ignore lint/style/noNonNullAssertion: see above
 						team: parseInt(x.team.match(/\d+/)![0]),
 						red: redTeams,