beta test

Author: henrybon806

api/averageMatchScores.tsx

@@ -210,45 +210,105 @@ export async function attachHourlyAverages(
     penalty: allValidMatches.length > 0 ? Number((allValidMatches.reduce((sum, row) => sum + (row.penalty ?? 0), 0) / allValidMatches.length).toFixed(2)) : 5,
   };
 
-  // Return matches with average data attached (but keep original match data intact)
-  return matches.map((match) => {
-    const window = getHourWindow(match.date);
-    let avg = hourlyAverages.get(`${window.start}-${window.end}`);
+  // Helper function to get smooth average using expanding time window
+  const getSmoothAverage = (matchDate: string, previousAverage?: { points: number; tele: number; penalty: number }) => {
+    const matchTime = new Date(matchDate).getTime();
 
-    // If no exact hour match, find the closest hour with actual data
-    if (!avg) {
-      const matchTime = new Date(match.date).getTime();
-      let closestAvg = null;
-      let closestDistance = Infinity;
+    // Try expanding time windows until we find enough data
+    const windowSizes = [1, 2, 4, 8, 12, 24]; // hours
+    
+    for (const windowSize of windowSizes) {
+      const startTime = new Date(matchTime - (windowSize * 60 * 60 * 1000));
+      const endTime = new Date(matchTime + (windowSize * 60 * 60 * 1000));
+      
+      const relevantMatches = data.filter(row => {
+        const rowTime = new Date(row.date).getTime();
+        return rowTime >= startTime.getTime() && 
+               rowTime <= endTime.getTime() && 
+               (row.totalPoints ?? 0) > 0;
+      });
+      
+      // Reduce minimum matches required for smaller windows to make it more responsive
+      const minMatches = windowSize <= 2 ? 3 : windowSize <= 8 ? 5 : 8;
 
-      // Find the closest hour with actual data
-      for (const [windowKey, avgData] of hourlyAverages) {
-        const windowStart = windowKey.split('-')[0];
-        try {
-          const windowTime = new Date(windowStart).getTime();
-          const distance = Math.abs(windowTime - matchTime);
-          
-          if (distance < closestDistance) {
-            closestDistance = distance;
-            closestAvg = avgData;
-          }
-        } catch (e) {
-          continue; // Skip invalid dates
+      if (relevantMatches.length >= minMatches) {
+        let totalPoints = 0;
+        let totalTele = 0;
+        let totalPenalty = 0;
+        
+        for (const row of relevantMatches) {
+          totalPoints += row.totalPoints ?? 0;
+          totalTele += row.tele ?? 0;
+          totalPenalty += row.penalty ?? 0;
         }
+        
+        const newAverage = {
+          points: Number((totalPoints / relevantMatches.length).toFixed(2)),
+          tele: Number((totalTele / relevantMatches.length).toFixed(2)),
+          penalty: Number((totalPenalty / relevantMatches.length).toFixed(2)),
+        };
+        
+        // If we have a previous average, smooth the transition (blend 70% new, 30% previous)
+        if (previousAverage) {
+          return {
+            points: Number((0.7 * newAverage.points + 0.3 * previousAverage.points).toFixed(2)),
+            tele: Number((0.7 * newAverage.tele + 0.3 * previousAverage.tele).toFixed(2)),
+            penalty: Number((0.7 * newAverage.penalty + 0.3 * previousAverage.penalty).toFixed(2)),
+          };
+        }
+        
+        return newAverage;
       }
-      
-      // Use closest if found, otherwise use overall fallback
-      avg = closestAvg || overallFallback;
     }
 
+    // If no good window found, use overall average (possibly blended with previous)
+    if (previousAverage) {
+      return {
+        points: Number((0.8 * overallFallback.points + 0.2 * previousAverage.points).toFixed(2)),
+        tele: Number((0.8 * overallFallback.tele + 0.2 * previousAverage.tele).toFixed(2)),
+        penalty: Number((0.8 * overallFallback.penalty + 0.2 * previousAverage.penalty).toFixed(2)),
+      };
+    }
+    
+    return overallFallback;
+  };
+
+  // Create a smoothed average cache for better interpolation
+  const sortedMatches = matches.sort((a, b) => new Date(a.date).getTime() - new Date(b.date).getTime());
+  const smoothedAverages = new Map<string, { points: number; tele: number; penalty: number }>();
+  
+  // Pre-calculate smooth averages for each unique time point with progressive smoothing
+  const uniqueTimes = [...new Set(sortedMatches.map(m => m.date))];
+  let previousAverage: { points: number; tele: number; penalty: number } | undefined;
+  
+  for (const time of uniqueTimes) {
+    const window = getHourWindow(time);
+    const windowKey = `${window.start}-${window.end}`;
+    
+    // First try exact hour match
+    let avg = hourlyAverages.get(windowKey);
+    
+    // If no exact match, use smooth averaging with previous context
+    if (!avg) {
+      avg = getSmoothAverage(time, previousAverage);
+    }
+    
+    smoothedAverages.set(time, avg);
+    previousAverage = avg; // Store for next iteration
+  }
+
+  // Return matches with smoothed average data
+  return matches.map((match) => {
+    const avg = smoothedAverages.get(match.date) || overallFallback;
+    
     // Return the original match data PLUS the average data for comparison
     return {
       ...match,
       // Keep original values
       totalPoints: match.totalPoints ?? 0,
       tele: match.tele ?? 0,
       penalty: match.penalty ?? 0,
-      // Add average data for graph comparison
+      // Add smoothed average data for graph comparison
       averagePoints: avg.points,
       averageTele: avg.tele,
       averagePenalty: avg.penalty,
@@ -272,7 +332,7 @@ export function getAverageByMatchType(matches: AllianceInfo[]): MatchTypeAverage
     if (m.matchType === 'QUALIFICATION') {
       qualTotal += pts;
       qualCount++;
-    } else if (m.matchType === 'PLAYOFF') {
+    } else if (m.matchType === 'PLAYOFF' || (typeof m.matchType === 'string' && (m.matchType as string).includes('FINAL'))) {
       finalsTotal += pts;
       finalsCount++;
     }

api/dashboardInfo.tsx

@@ -30,38 +30,63 @@ function getCacheKey(year: SupportedYear, teamNumber: number): string {
 }
 
 // ------------------- TEAMS -------------------
-export async function getAllTeams(year: SupportedYear): Promise<TeamInfo[] | null> {
+export async function getAllTeams(year: SupportedYear, retryCount = 0): Promise<TeamInfo[] | null> {
   if (allTeamsCache.has(year) && allTeamsCache.get(year)) {
-    return allTeamsCache.get(year)!;
+    const cachedData = allTeamsCache.get(year)!;
+    if (cachedData.length > 0) {
+      return cachedData;
+    }
   }
 
-  const { data } = await supabase
-    .from(getSeasonTable(year))
-    .select('teamName, teamNumber, overallOPR, overallRank, location, autoOPR, teleOPR, endgameOPR, autoRank, teleRank, endgameRank')
-    .order('overallRank', { ascending: true })
-    .throwOnError();
+  try {
+    const { data, error } = await supabase
+      .from(getSeasonTable(year))
+      .select('teamName, teamNumber, overallOPR, overallRank, location, autoOPR, teleOPR, endgameOPR, autoRank, teleRank, endgameRank')
+      .order('overallRank', { ascending: true });
 
-  const result = data.map(row => ({
-    teamName: row.teamName || `Team ${row.teamNumber}`,
-    teamNumber: row.teamNumber,
-    overallOPR: row.overallOPR || 0,
-    overallRank: row.overallRank || 0,
-    location: row.location || 'N/A',
-    autoOPR: row.autoOPR || 0,
-    teleOPR: row.teleOPR || 0,
-    endgameOPR: row.endgameOPR || 0,
-    autoRank: row.autoRank || 0,
-    teleRank: row.teleRank || 0,
-    endgameRank: row.endgameRank || 0,
-    founded: 'N/A',
-    highestScore: '',
-    website: 'None',
-    sponsors: '',
-    achievements: 'None This Season',
-  }));
+    if (error) {
+      throw error;
+    }
 
-  allTeamsCache.set(year, result);
-  return result;
+    if (!data || data.length === 0) {
+      console.warn(`No teams data found for year ${year}`);
+      return [];
+    }
+
+    const result = data.map(row => ({
+      teamName: row.teamName || `Team ${row.teamNumber}`,
+      teamNumber: row.teamNumber,
+      overallOPR: row.overallOPR || 0,
+      overallRank: row.overallRank || 0,
+      location: row.location || 'N/A',
+      autoOPR: row.autoOPR || 0,
+      teleOPR: row.teleOPR || 0,
+      endgameOPR: row.endgameOPR || 0,
+      autoRank: row.autoRank || 0,
+      teleRank: row.teleRank || 0,
+      endgameRank: row.endgameRank || 0,
+      founded: 'N/A',
+      highestScore: '',
+      website: 'None',
+      sponsors: '',
+      achievements: 'None This Season',
+    }));
+
+    allTeamsCache.set(year, result);
+    return result;
+  } catch (error) {
+    console.error(`Error fetching teams for year ${year}:`, error);
+    
+    // Retry up to 2 times with exponential backoff
+    if (retryCount < 2) {
+      const delay = Math.pow(2, retryCount) * 1000; // 1s, 2s delays
+      await new Promise(resolve => setTimeout(resolve, delay));
+      return getAllTeams(year, retryCount + 1);
+    }
+    
+    // Return empty array instead of null to prevent UI issues
+    return [];
+  }
 }
 
 export async function getTeamInfo(teamNumber: number, year: SupportedYear): Promise<TeamInfo | null> {

app/dashboards/age.tsx

@@ -351,7 +351,7 @@ useEffect(() => {
           {matchTypeAverages && <EventPerformance matchType={matchTypeAverages}/>}
           {teamInfo && <EventScores teamInfo={teamInfo} />}
           {teamInfo && (
-            <View style={{ minWidth: 550, flexShrink: 0 }}>
+            <View style={{ minWidth: 550, flexShrink: 0, alignSelf: 'stretch' }}>
               <InfoBlock screenWidth={containerWidth} teamInfo={teamInfo} highScore={highestScore}/>
             </View>
           )}
@@ -458,6 +458,7 @@ const styles = StyleSheet.create({
     gap: 16,
     marginBottom: 20,
     flexDirection: 'row',
+    alignItems: 'stretch', // This makes all child components have equal height
   },
   eventContainer: {
     marginBottom: -20,

app/dashboards/energize.tsx

@@ -179,7 +179,6 @@ useEffect(() => {
   };
 
   const getSeasonDisplayText = () => {
-    // Map years to game names if you have them, otherwise just show the year
     const gameNames: Record<SupportedYear, string> = {
       2019: '2019 - Skystone',
       2020: '2020 - Ultimate Goal',
@@ -353,7 +352,7 @@ useEffect(() => {
           {matchTypeAverages && <EventPerformance matchType={matchTypeAverages}/>}
           {teamInfo && <EventScores teamInfo={teamInfo} />}
           {teamInfo && (
-            <View style={{ minWidth: 550, flexShrink: 0 }}>
+            <View style={{ minWidth: 550, flexShrink: 0, alignSelf: 'stretch' }}>
               <InfoBlock screenWidth={containerWidth} teamInfo={teamInfo} highScore={highestScore}/>
             </View>
           )}
@@ -460,6 +459,7 @@ const styles = StyleSheet.create({
     gap: 16,
     marginBottom: 20,
     flexDirection: 'row',
+    alignItems: 'stretch', // This makes all child components have equal height
   },
   eventContainer: {
     marginBottom: -20,

app/dashboards/forward.tsx

@@ -351,7 +351,7 @@ useEffect(() => {
           {matchTypeAverages && <EventPerformance matchType={matchTypeAverages}/>}
           {teamInfo && <EventScores teamInfo={teamInfo} />}
           {teamInfo && (
-            <View style={{ minWidth: 550, flexShrink: 0 }}>
+            <View style={{ minWidth: 550, flexShrink: 0, alignSelf: 'stretch' }}>
               <InfoBlock screenWidth={containerWidth} teamInfo={teamInfo} highScore={highestScore}/>
             </View>
           )}
@@ -458,6 +458,7 @@ const styles = StyleSheet.create({
     gap: 16,
     marginBottom: 20,
     flexDirection: 'row',
+    alignItems: 'stretch', // This makes all child components have equal height
   },
   eventContainer: {
     marginBottom: -20,

app/dashboards/gameChangers.tsx

@@ -351,7 +351,7 @@ useEffect(() => {
           {matchTypeAverages && <EventPerformance matchType={matchTypeAverages}/>}
           {teamInfo && <EventScores teamInfo={teamInfo} />}
           {teamInfo && (
-            <View style={{ minWidth: 550, flexShrink: 0 }}>
+            <View style={{ minWidth: 550, flexShrink: 0, alignSelf: 'stretch' }}>
               <InfoBlock screenWidth={containerWidth} teamInfo={teamInfo} highScore={highestScore}/>
             </View>
           )}
@@ -458,6 +458,7 @@ const styles = StyleSheet.create({
     gap: 16,
     marginBottom: 20,
     flexDirection: 'row',
+    alignItems: 'stretch', // This makes all child components have equal height
   },
   eventContainer: {
     marginBottom: -20,

app/dashboards/inShow.tsx

@@ -351,7 +351,7 @@ useEffect(() => {
           {matchTypeAverages && <EventPerformance matchType={matchTypeAverages}/>}
           {teamInfo && <EventScores teamInfo={teamInfo} />}
           {teamInfo && (
-            <View style={{ minWidth: 550, flexShrink: 0 }}>
+            <View style={{ minWidth: 550, flexShrink: 0, alignSelf: 'stretch' }}>
               <InfoBlock screenWidth={containerWidth} teamInfo={teamInfo} highScore={highestScore}/>
             </View>
           )}
@@ -458,6 +458,7 @@ const styles = StyleSheet.create({
     gap: 16,
     marginBottom: 20,
     flexDirection: 'row',
+    alignItems: 'stretch', // This makes all child components have equal height
   },
   eventContainer: {
     marginBottom: -20,

app/dashboards/intothedeep.tsx

@@ -351,7 +351,7 @@ useEffect(() => {
           {matchTypeAverages && <EventPerformance matchType={matchTypeAverages}/>}
           {teamInfo && <EventScores teamInfo={teamInfo} />}
           {teamInfo && (
-            <View style={{ minWidth: 550, flexShrink: 0 }}>
+            <View style={{ minWidth: 550, flexShrink: 0, alignSelf: 'stretch' }}>
               <InfoBlock screenWidth={containerWidth} teamInfo={teamInfo} highScore={highestScore}/>
             </View>
           )}
@@ -458,6 +458,7 @@ const styles = StyleSheet.create({
     gap: 16,
     marginBottom: 20,
     flexDirection: 'row',
+    alignItems: 'stretch', // This makes all child components have equal height
   },
   eventContainer: {
     marginBottom: -20,

app/dashboards/rise.tsx

@@ -351,7 +351,7 @@ useEffect(() => {
           {matchTypeAverages && <EventPerformance matchType={matchTypeAverages}/>}
           {teamInfo && <EventScores teamInfo={teamInfo} />}
           {teamInfo && (
-            <View style={{ minWidth: 550, flexShrink: 0 }}>
+            <View style={{ minWidth: 550, flexShrink: 0, alignSelf: 'stretch' }}>
               <InfoBlock screenWidth={containerWidth} teamInfo={teamInfo} highScore={highestScore}/>
             </View>
           )}
@@ -458,6 +458,7 @@ const styles = StyleSheet.create({
     gap: 16,
     marginBottom: 20,
     flexDirection: 'row',
+    alignItems: 'stretch', // This makes all child components have equal height
   },
   eventContainer: {
     marginBottom: -20,

components/graphs/overtimeGraph.tsx

@@ -53,7 +53,7 @@ const UserGraphSection = ({ screenWidth, teamInfo, matches, averages, wins }: Us
 
   const matchData = matches
     ?.sort((a, b) => new Date(a.date).getTime() - new Date(b.date).getTime())
-    .map((match, index) => {
+    .map((match, index, sortedMatches) => {
       const activeKey = tabKeyMap[activeTab];
 
       // Get the corresponding average key
@@ -62,10 +62,21 @@ const UserGraphSection = ({ screenWidth, teamInfo, matches, averages, wins }: Us
                         activeKey === 'penalty' ? 'averagePenalty' : 
                         'averagePoints';
 
+      let averageValue = Number(match[averageKey as keyof AllianceInfo] ?? 0);
+      
+      // Apply smoothing to make the average line more fluid
+      if (index > 0 && index < sortedMatches.length - 1) {
+        const prevAvg = Number(sortedMatches[index - 1][averageKey as keyof AllianceInfo] ?? averageValue);
+        const nextAvg = Number(sortedMatches[index + 1][averageKey as keyof AllianceInfo] ?? averageValue);
+        
+        // Simple moving average smoothing (30% of neighboring values)
+        averageValue = Number((0.4 * averageValue + 0.3 * prevAvg + 0.3 * nextAvg).toFixed(2));
+      }
+
       return {
         name: `M${index + 1}`,
         current: match[activeKey] ?? 0,
-        average: match[averageKey as keyof AllianceInfo] ?? 0,
+        average: averageValue,
       };
     }) ?? [];