predict today checkbox

index.html

@@ -23,6 +23,12 @@
                     <input type="number" id="target-acwr-input" value="1.3" min="0.5" max="3" step="0.1"
                         placeholder="1.3" />
                 </div>
+                <div class="ftp-input-container">
+                    <label for="predict-today-input" style="display: flex; align-items: center; gap: 0.5rem; cursor: pointer;">
+                        <input type="checkbox" id="predict-today-input" style="width: auto; margin: 0;" />
+                        <span>Predict today</span>
+                    </label>
+                </div>
                 <div class="ftp-input-container">
                     <label for="threshold-hr-input">Threshold HR</label>
                     <input type="number" id="threshold-hr-input" value="190" min="100" max="220" step="1"

src/components/charts.ts

@@ -59,7 +59,7 @@ const acwrGradientPlugin = {
         // Find the ACWR dataset by label
         const acwrDatasetIndex = chart.data.datasets.findIndex(ds => ds.label === 'ACWR');
         if (acwrDatasetIndex === -1) return;
-        
+
         const meta = chart.getDatasetMeta(acwrDatasetIndex);
         if (!meta || meta.hidden) return;
 

src/main.ts

@@ -14,6 +14,7 @@ import {
 const csvUpload = document.getElementById('csv-upload') as HTMLInputElement;
 const ftpInput = document.getElementById('ftp-input') as HTMLInputElement;
 const targetAcwrInput = document.getElementById('target-acwr-input') as HTMLInputElement;
+const predictTodayInput = document.getElementById('predict-today-input') as HTMLInputElement;
 const thresholdHrInput = document.getElementById('threshold-hr-input') as HTMLInputElement;
 const restingHrInput = document.getElementById('resting-hr-input') as HTMLInputElement;
 const uploadStatus = document.getElementById('upload-status') as HTMLDivElement;
@@ -31,6 +32,7 @@ let selectedActivityTypes: Set<string> = new Set(['Running']);
 // Event listeners
 csvUpload?.addEventListener('change', handleFileUpload);
 targetAcwrInput?.addEventListener('input', handleTargetAcwrChange);
+predictTodayInput?.addEventListener('change', handlePredictTodayChange);
 helpButton?.addEventListener('click', () => helpPopover?.classList.remove('hidden'));
 helpClose?.addEventListener('click', () => helpPopover?.classList.add('hidden'));
 helpPopover?.addEventListener('click', (e) => {
@@ -49,7 +51,22 @@ function handleTargetAcwrChange(): void {
         : allActivities;
 
     const targetAcwr = parseFloat(targetAcwrInput.value) || 1.3;
-    renderCharts(filteredActivities, targetAcwr);
+    const predictToday = predictTodayInput?.checked || false;
+    renderCharts(filteredActivities, targetAcwr, predictToday);
+}
+
+function handlePredictTodayChange(): void {
+    // Only refresh if we have activities loaded
+    if (allActivities.length === 0) return;
+
+    // Filter and render with new predict today setting
+    const filteredActivities = selectedActivityTypes.size > 0
+        ? allActivities.filter(activity => selectedActivityTypes.has(activity.activityType || ''))
+        : allActivities;
+
+    const targetAcwr = parseFloat(targetAcwrInput.value) || 1.3;
+    const predictToday = predictTodayInput?.checked || false;
+    renderCharts(filteredActivities, targetAcwr, predictToday);
 }
 
 function createActivityTypeFilters(activities: Activity[]): void {
@@ -129,7 +146,8 @@ function handleFilterChange(): void {
         : allActivities;
 
     const targetAcwr = parseFloat(targetAcwrInput.value) || 1.3;
-    renderCharts(filteredActivities, targetAcwr);
+    const predictToday = predictTodayInput?.checked || false;
+    renderCharts(filteredActivities, targetAcwr, predictToday);
 }
 
 async function handleFileUpload(event: Event): Promise<void> {
@@ -164,7 +182,8 @@ async function handleFileUpload(event: Event): Promise<void> {
             ? allActivities.filter(activity => selectedActivityTypes.has(activity.activityType || ''))
             : allActivities;
         const targetAcwr = parseFloat(targetAcwrInput.value) || 1.3;
-        renderCharts(filteredActivities, targetAcwr);
+        const predictToday = predictTodayInput?.checked || false;
+        renderCharts(filteredActivities, targetAcwr, predictToday);
 
         // Show filter and charts sections
         filterSection.classList.remove('hidden');
@@ -182,15 +201,32 @@ async function handleFileUpload(event: Event): Promise<void> {
     }
 }
 
-function renderCharts(activities: Activity[], targetAcwr: number): void {
+function renderCharts(activities: Activity[], targetAcwr: number, predictToday: boolean = false): void {
     // Calculate date range from first activity to today
     let dateRange: { start: Date; end: Date } | undefined;
     if (allActivities.length > 0) {
-        // Use current date/time as end date (today)
+        // 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 => {
+            const activityDate = new Date(activity.date);
+            activityDate.setHours(0, 0, 0, 0);
+            return activityDate.getTime() === today.getTime();
+        });
+        
+        // If predictToday is checked and today has no activities, end range at yesterday
+        // This prevents today from appearing twice (once as null, once as prediction)
         const endDate = new Date();
+        if (predictToday && !todayHasActivities) {
+            // End at yesterday so today only appears in predictions
+            endDate.setDate(endDate.getDate() - 1);
+        }
         endDate.setHours(23, 59, 59, 999);
 
-        // Calculate start date as 1.5 times chronic workload period (28 days) before today
+        // Calculate start date as 1.5 times chronic workload period (28 days) before end date
         const startDate = new Date(endDate);
         startDate.setDate(startDate.getDate() - Math.floor(28 * 1.5));
         startDate.setHours(0, 0, 0, 0);
@@ -206,25 +242,29 @@ function renderCharts(activities: Activity[], targetAcwr: number): void {
         activities,
         (activity) => activity.distance,
         dateRange,
-        targetAcwr
+        targetAcwr,
+        predictToday
     );
     const durationData = calculateMetricACWR(
         activities,
         (activity) => activity.duration,
         dateRange,
-        targetAcwr
+        targetAcwr,
+        predictToday
     );
     const tssData = calculateMetricACWR(
         activities,
         (activity) => activity.trainingStressScore,
         dateRange,
-        targetAcwr
+        targetAcwr,
+        predictToday
     );
     const caloriesData = calculateMetricACWR(
         activities,
         (activity) => activity.calories,
         dateRange,
-        targetAcwr
+        targetAcwr,
+        predictToday
     );
 
     // Destroy existing charts

src/utils/metricAcwr.ts

@@ -13,12 +13,18 @@ function formatDateLocal(date: Date): string {
 /**
  * Calculate optimal activity values for the next 7 days to reach and maintain target ACWR
  * Uses a greedy algorithm that optimizes each day to get closer to target ACWR
+ * @param allDates - Array of all historical dates
+ * @param dailyValues - Map of date strings to activity values
+ * @param targetACWR - Target ACWR to achieve
+ * @param numFutureDays - Number of future days to predict (default 7)
+ * @param startOffset - Day offset to start predictions (0 for today, 1 for tomorrow)
  */
 function calculateOptimalFutureDays(
     allDates: Date[],
     dailyValues: Map<string, number>,
     targetACWR: number,
-    numFutureDays: number = 7
+    numFutureDays: number = 7,
+    startOffset: number = 1
 ): {
     futureDates: string[];
     futureValues: number[];
@@ -39,9 +45,12 @@ function calculateOptimalFutureDays(
     // Get the last date in the data
     const lastDate = new Date(allDates[allDates.length - 1]);
 
-    for (let dayOffset = 1; dayOffset <= numFutureDays; dayOffset++) {
+    for (let dayOffset = 0; dayOffset < numFutureDays; dayOffset++) {
         const futureDate = new Date(lastDate);
-        futureDate.setDate(lastDate.getDate() + dayOffset);
+        // Add 1 + startOffset + dayOffset to go beyond lastDate
+        // startOffset=0: start from day after lastDate (tomorrow if lastDate is today)
+        // startOffset=1: skip one day, start from 2 days after lastDate
+        futureDate.setDate(lastDate.getDate() + 1 + startOffset + dayOffset);
         const futureDateStr = formatDateLocal(futureDate);
 
         futureDates.push(futureDateStr);
@@ -128,12 +137,15 @@ function calculateOptimalFutureDays(
  * @param activities - Array of activities
  * @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
+    targetACWR: number = 1.3,
+    predictToday: boolean = false
 ): MetricACWRData {
     if (activities.length === 0 && !dateRange) {
         return {
@@ -341,6 +353,24 @@ export function calculateMetricACWR(
         todayValue: undefined,
         activitiesByDate,
         // Add future predictions if we have enough data
-        ...(allDates.length >= 28 ? calculateOptimalFutureDays(allDates, dailyValues, targetACWR, 7) : {}),
+        // 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);
+        })() : {}),
     };
 }