Error Handling + Helper Text

.github/workflows/main.yml

@@ -14,4 +14,4 @@ jobs:
  - name: Install Prettier
  run: yarn add prettier --dev
  - name: Check code formatting
- run: yarn pretty --check
+ run: yarn pretty:check

Utility.js

@@ -34,19 +34,13 @@ export function numTrunc(value, pad = false) {
  }
 }
 
-export function refToID(ref) {
- return ref["_key"] ? ref["_key"]["path"]["segments"].at(-1) : "bad ref";
-}
-
-export function getUnique(array, field) {
- const uniqueMap = new Map();
- array.forEach((element) => {
- const keyValue = element[field];
- if (!uniqueMap.has(keyValue)) {
- uniqueMap.set(keyValue, element);
- }
+export function getUnique(array, drills) {
+ const unique = [];
+ drills.forEach((drillInfo) => {
+ const idx = array.findIndex((item) => item["did"] === drillInfo["did"]);
+ if (idx >= 0) unique.push(drillInfo);
  });
- return Array.from(uniqueMap.values());
+ return unique;
 }
 
 export function calculateAverageProxToHole(drillSubmissions) {
@@ -164,8 +158,16 @@ export function lookUpExpectedPutts(proxHole) {
 }
 
 export function getIconByKey(key) {
- const icons = [{ carry: "arrow-up" }, { sideLanding: "arrow-left-right" }];
+ const icons = [
+ { carry: "arrow-up" },
+ { sideLanding: "arrow-left-right" },
+ { strokes: "golf-tee" },
+ ];
 
  const iconObject = icons.find((icon) => icon[key]);
  return iconObject ? iconObject[key] : null;
 }
+
+export const getCombinedDrillTitle = (drillInfo) => {
+ return `${drillInfo.prettyDrillType} | ${drillInfo.subType}`;
+};

add_user_data.py

@@ -0,0 +1,37 @@
+import random
+import time
+import math
+import firebase_admin
+from firebase_admin import firestore
+
+app = firebase_admin.initialize_app()
+db = firestore.client()
+
+# Define the assigned_data array
+assigned_data = [
+ {"drillId": "YtCsaxzscFScnpZYmnKI", "assignedTime": "1712600157", "completed": False},
+ {"drillId": "YtCsaxzscFScnpZYmnKI", "assignedTime": "1712531560", "completed": False},
+ {"drillId": "SpvYyY94HaulVH2zmVyM", "assignedTime": "1712531460", "completed": False},
+ {"drillId": "SpvYyY94HaulVH2zmVyM", "assignedTime": "1712531360", "completed": True},
+ {"drillId": "SpvYyY94HaulVH2zmVyM", "assignedTime": "1712531260", "completed": False},
+ {"drillId": "SpvYyY94HaulVH2zmVyM", "assignedTime": "1712470455", "completed": False},
+ {"drillId": "SpvYyY94HaulVH2zmVyM", "assignedTime": "1712470355", "completed": True},
+ {"drillId": "SpvYyY94HaulVH2zmVyM", "assignedTime": "1712470255", "completed": False},
+ {"drillId": "SpvYyY94HaulVH2zmVyM", "assignedTime": "1712384055", "completed": False},
+ {"drillId": "SpvYyY94HaulVH2zmVyM", "assignedTime": "1709709255", "completed": False},
+ {"drillId": "SpvYyY94HaulVH2zmVyM", "assignedTime": "1709622855", "completed": False},
+]
+
+# Get a reference to the user collection
+users_collection = db.collection("teams").document("1").collection("users")
+
+
+print(users_collection.stream())
+
+
+# Loop through each document in the collection and update the assigned_data field
+for doc in users_collection.stream():
+ print(doc)
+ doc_ref = users_collection.document(doc.id)
+ doc_ref.update({'assigned_data': assigned_data})
+ print(f"Document {doc.id} updated successfully.")

app/(auth)/signin.js

@@ -32,7 +32,7 @@ export default function SignIn() {
  email,
  password,
  );
- console.log(userCredential.user);
+ // console.log(userCredential.user);
  } catch (e) {
  alert(e);
  console.log(e);

app/(auth)/signup.js

@@ -52,11 +52,12 @@ export default function SignUp() {
  // hardcoded "player" role for now, add role selection to profile settings in future PR
  role: "player",
  uid: userRef,
+ assigned_data: [],
  });
 
  setCurrentUserId(userCredential.user.uid);
 
- console.log(userCredential.user);
+ // console.log(userCredential.user);
  } catch (e) {
  alert(e);
  console.log(e);

app/content/_layout.js

@@ -1,10 +1,7 @@
 import { Tabs } from "expo-router";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
-import { currentAuthContext } from "~/context/Auth";
 
 export default () => {
- const { currentUserId } = currentAuthContext();
- console.log("user", currentUserId);
  return (
  <Tabs options={{ headerShown: false }}>
  <Tabs.Screen

app/content/drill/[id]/attempts/[attempt].js

@@ -1,190 +1,28 @@
-import { useLocalSearchParams } from "expo-router";
-import {
- ScrollView,
- StyleSheet,
- Text,
- View,
- useWindowDimensions,
-} from "react-native";
+import { useLocalSearchParams, useNavigation } from "expo-router";
+import { StyleSheet } from "react-native";
+import { Appbar } from "react-native-paper";
 import { SafeAreaView } from "react-native-safe-area-context";
-import ScatterChart from "react-native-scatter-chart";
-import { numTrunc } from "~/Utility";
-import ErrorComponent from "~/components/errorComponent";
-import Loading from "~/components/loading";
-import ShotAccordion from "~/components/shotAccordion";
-import { useAttempts } from "~/hooks/useAttempts";
-import { useDrillInfo } from "~/hooks/useDrillInfo";
+import ResultScreen from "../../../../../components/resultScreen";
 
-function Result() {
+export default function Result() {
  const drillId = useLocalSearchParams()["id"];
  const attemptId = useLocalSearchParams()["attempt"];
- const { width } = useWindowDimensions();
-
- const {
- data: drillInfo,
- isLoading: drillInfoIsLoading,
- error: drillInfoError,
- } = useDrillInfo(drillId);
-
- const {
- data: attempt,
- isLoading: attemptIsLoading,
- error: attemptError,
- } = useAttempts({ attemptId });
-
- if (drillInfoIsLoading || attemptIsLoading) {
- return <Loading />;
- }
-
- if (drillInfoError || attemptError) {
- return <ErrorComponent message={[drillInfoError, attemptError]} />;
- }
-
- let dots = [];
- if (
- drillInfo["outputs"].includes("sideLanding") &&
- drillInfo["outputs"].includes("carryDiff")
- ) {
- dots = attempt["shots"].map((value, index) => [
- value["sideLanding"],
- value["carryDiff"],
- ]);
- }
+ const navigation = useNavigation();
 
  return (
- <>
- <SafeAreaView style={{ flex: 1 }} edges={["right", "top", "left"]}>
- <ScrollView contentContainerStyle={styles.container}>
- <Text style={styles.sectionTitle}>Drill Results</Text>
-
- {Object.keys(drillInfo).length > 0 &&
- Object.keys(drillInfo["aggOutputs"]).map((output) => (
- <View
- style={{
- flexDirection: "row",
- justifyContent: "space-between",
- alignItems: "center",
- }}
- key={output}
- >
- <Text>{output}</Text>
- <Text>{numTrunc(attempt[output])}</Text>
- </View>
- ))}
-
- {dots.length > 0 && (
- <View style={styles.chartSection}>
- <Text style={styles.sectionTitle}>Shot Tendency</Text>
- <View style={{ ...styles.chartContainer, width: width * 0.8 }}>
- <ScatterChart
- style={styles.chart}
- backgroundColor="#ffffff"
- data={[
- {
- color: "blue",
- unit: "%",
- values: dots,
- },
- ]}
- horizontalLinesAt={[0]}
- verticalLinesAt={[0]}
- minY={-10}
- maxY={10}
- minX={-35}
- maxX={35}
- chartWidth={width * 0.8}
- />
- </View>
- </View>
- )}
-
- {attempt["shots"] &&
- attempt["shots"].map((shot) => (
- <ShotAccordion
- key={shot["sid"]}
- shot={shot}
- drillInfo={drillInfo}
- total={numTrunc(attempt["shots"].length)}
- />
- ))}
- </ScrollView>
- </SafeAreaView>
- </>
+ <SafeAreaView style={{ flex: 1 }} edges={["right", "top", "left"]}>
+ <Appbar.Header style={{ backgroundColor: "FFF" }} statusBarHeight={0}>
+ <Appbar.BackAction onPress={navigation.goBack} color={"#F24E1E"} />
+ <Appbar.Content title="Drill Results" titleStyle={styles.title} />
+ </Appbar.Header>
+ <ResultScreen drillId={drillId} attemptId={attemptId} />
+ </SafeAreaView>
  );
 }
 
-export default Result;
-
 const styles = StyleSheet.create({
- container: {
- padding: 20,
- paddingBottom: 0,
- },
- header: {
- flexDirection: "row",
- justifyContent: "space-between",
- marginBottom: 20,
- },
- headerText: {
+ title: {
  fontSize: 18,
  fontWeight: "bold",
  },
- sectionTitle: {
- fontSize: 26,
- fontWeight: "bold",
- marginBottom: 10,
- alignSelf: "center",
- },
- dataSection: {
- alignItems: "center",
- justifyContent: "center",
- marginBottom: 20,
- padding: 15,
- backgroundColor: "#f5f5f5",
- borderRadius: 10,
- width: "60%",
- alignSelf: "center",
- },
- dataTitle: {
- fontSize: 16,
- fontWeight: "bold",
- marginBottom: 10,
- },
-
- dataRow: {
- flexDirection: "row",
- justifyContent: "space-between",
- alignItems: "center",
- marginBottom: 5,
- },
-
- dataLabel: {
- fontSize: 14,
- },
-
- dataValue: {
- fontSize: 14,
- fontWeight: "bold",
- },
-
- chartSection: {
- marginBottom: 30,
- alignItems: "center",
- },
- chartContainer: {},
- chart: {
- backgroundColor: "#ffffff",
- position: "absolute",
- left: 0,
- right: 0,
- top: 0,
- bottom: 0,
- alignSelf: "center",
- height: 350,
- },
-
- restartButton: {
- margin: 10,
- alignItems: "center",
- },
 });