fix

src/components/charts.ts

@@ -393,7 +393,7 @@ function createDualAxisChart(
                     type: 'scatter' as const,
                     label: `Predicted Daily ${metricLabel}`,
                     data: Array(historicalCount).fill(null).concat(
-                        data.futureValues.map(v => v > 0 ? v : null)
+                        data.futureValues.map(v => (v !== null && v > 0) ? v : null)
                     ),
                     backgroundColor: 'rgba(148, 163, 184, 0.6)',
                     borderColor: 'rgba(100, 116, 139, 0.8)',

src/main.ts

@@ -208,7 +208,6 @@ function renderCharts(activities: Activity[], targetAcwr: number, predictToday:
         // Determine end date based on whether we'll include today in predictions
         const today = new Date();
         today.setHours(0, 0, 0, 0);
-        const todayStr = today.toISOString().split('T')[0];
         
         // Check if today has activities
         const todayHasActivities = activities.some(activity => {
@@ -242,29 +241,25 @@ function renderCharts(activities: Activity[], targetAcwr: number, predictToday:
         activities,
         (activity) => activity.distance,
         dateRange,
-        targetAcwr,
-        predictToday
+        targetAcwr
     );
     const durationData = calculateMetricACWR(
         activities,
         (activity) => activity.duration,
         dateRange,
-        targetAcwr,
-        predictToday
+        targetAcwr
     );
     const tssData = calculateMetricACWR(
         activities,
         (activity) => activity.trainingStressScore,
         dateRange,
-        targetAcwr,
-        predictToday
+        targetAcwr
     );
     const caloriesData = calculateMetricACWR(
         activities,
         (activity) => activity.calories,
         dateRange,
-        targetAcwr,
-        predictToday
+        targetAcwr
     );
 
     // Destroy existing charts

src/utils/metricAcwr.ts

@@ -138,14 +138,12 @@ function calculateOptimalFutureDays(
  * @param metricExtractor - Function to extract the metric value from an activity
  * @param dateRange - Optional date range to maintain consistency
  * @param targetACWR - Target ACWR value for predictions
- * @param predictToday - If true, include today in predictions; if false, predictions start tomorrow
  */
 export function calculateMetricACWR(
     activities: Activity[],
     metricExtractor: (activity: Activity) => number | undefined,
     dateRange?: { start: Date; end: Date },
-    targetACWR: number = 1.3,
-    predictToday: boolean = false
+    targetACWR: number = 1.3
 ): MetricACWRData {
     if (activities.length === 0 && !dateRange) {
         return {
@@ -353,24 +351,7 @@ export function calculateMetricACWR(
         todayValue: undefined,
         activitiesByDate,
         // Add future predictions if we have enough data
-        // Determine start offset based on predictToday and whether today has activities
-        ...(allDates.length >= 28 ? (() => {
-            const today = new Date();
-            const todayStr = formatDateLocal(today);
-            const lastDateStr = formatDateLocal(allDates[allDates.length - 1]);
-            
-            // Check if today is the last date in our data and if it has any activities
-            const todayHasActivities = todayStr === lastDateStr && dailyValues.has(todayStr);
-            
-            // startOffset determines which day to start predictions from relative to lastDate
-            // startOffset=0: predictions start from lastDate + 1 (next day after last data)
-            // startOffset=1: predictions start from lastDate + 2 (skip one day)
-            // predictToday unchecked: start from next day (offset 0)
-            // predictToday checked and today has activities: start from next day (offset 0) 
-            // predictToday checked and today has no activities: start from next day (offset 0), but lastDate was yesterday
-            const startOffset = 0;
-            
-            return calculateOptimalFutureDays(allDates, dailyValues, targetACWR, 7, startOffset);
-        })() : {}),
+        // Predictions always start from the day after lastDate
+        ...(allDates.length >= 28 ? calculateOptimalFutureDays(allDates, dailyValues, targetACWR, 7, 0) : {}),
     };
 }