Updated targeting to fix bugs, remove any : types and default impact calculations.

Author: MattG57

backend/src/services/target-calculation-service.ts

@@ -687,15 +687,15 @@ RESULT:
    * Calculate weekly time saved in hours per developer
    */
   calculateWeeklyTimeSavedHrs(): Target {
-    // If no surveys, return default values
+    // If no surveys, return default values with 2 hrs current
     if (this.surveysWeekly.length === 0) {
-      return { current: 0, target: 0, max: 10 };
+      return { current: 2, target: 2, max: 10 };
     }
 
     // Get distinct users who submitted surveys
     const distinctUsers = this.getDistinctSurveyUsers(this.surveysWeekly);
     if (distinctUsers.length === 0) {
-      return { current: 0, target: 0, max: 10 };
+      return { current: 2, target: 2, max: 10 };
     }
 
     // Group surveys by user to get average time saved per user
@@ -725,9 +725,13 @@ RESULT:
     const maxPercentTimeSaved = this.settings.percentTimeSaved != null ? parseFloat(this.settings.percentTimeSaved as any) : 20;
     const maxWeeklyTimeSaved = weeklyDevHours * (maxPercentTimeSaved / 100);
 
+    // Use default value of 2 if calculated value is 0 or very small
+    const currentValue = avgWeeklyTimeSaved < 0.1 ? 2 : this.roundToDecimal(avgWeeklyTimeSaved);
+    const targetValue = avgWeeklyTimeSaved < 0.1 ? 3 : this.roundToDecimal(Math.min(avgWeeklyTimeSaved * 1.5, maxWeeklyTimeSaved * 0.8));
+    
     const result = {
-      current: this.roundToDecimal(avgWeeklyTimeSaved),
-      target: this.roundToDecimal(Math.min(avgWeeklyTimeSaved * 1.5, maxWeeklyTimeSaved * 0.8)), // Target is 50% increase, capped at 80% of max
+      current: currentValue,
+      target: targetValue, // Target is 50% increase, capped at 80% of max
       max: this.roundToDecimal(maxWeeklyTimeSaved || 10) // Provide a fallback
     };
 
@@ -740,9 +744,11 @@ RESULT:
         userPercentages: userTimeSavings,
         hoursPerYear: hoursPerYear,
         percentCoding: percentCoding,
-        weeklyDevHours: weeklyDevHours
+        weeklyDevHours: weeklyDevHours,
+        calculatedWeeklyTimeSaved: avgWeeklyTimeSaved,
+        usedDefaultValue: avgWeeklyTimeSaved < 0.1
       },
-      'Calculate average time saved percentage per user, then weeklyDevHours * (avgPercentTimeSaved / 100)',
+      'Calculate average time saved percentage per user, then weeklyDevHours * (avgPercentTimeSaved / 100), use default value of 2 if result is < 0.1',
       result
     );
 
@@ -770,9 +776,11 @@ RESULT:
       {
         adoptedDevsCount: adoptedDevs,
         weeklyTimeSavedHrs: weeklyTimeSavedHrs,
+        monthlyCalculation: `${adoptedDevs} * ${weeklyTimeSavedHrs} * 4 = ${monthlyTimeSavings}`,
+        calculatedMonthlyTimeSavings: monthlyTimeSavings,
         seatsCount: this.calculateSeats().current
       },
-      'Calculate adoptedDevs * weeklyTimeSavedHrs * 4, set current = monthlyTimeSavings, max = 80 * seats',
+      'Calculate adoptedDevs * weeklyTimeSavedHrs * 4 (weeklyTimeSavedHrs already includes default of 2 if needed), max = 80 * seats',
       result
     );
 
@@ -784,7 +792,7 @@ RESULT:
    */
   calculateAnnualTimeSavingsAsDollars(): Target {
     const adoptedDevs = this.calculateAdoptedDevs().current;
-    const weeklyTimeSavedHrs = this.calculateWeeklyTimeSavedHrs().current;
+    const weeklyTimeSavedHrs = this.calculateWeeklyTimeSavedHrs().current; // This now includes default of 2 if needed
 
     // Always parse settings values as numbers (from string if needed)
     const hoursPerYear = this.settings.hoursPerYear != null ? parseFloat(this.settings.hoursPerYear as any) : 2000;
@@ -799,7 +807,7 @@ RESULT:
     const result = {
       current: Math.round(annualSavings || 0), // Round to whole dollars
       target: 0,
-      max: Math.round(12 * this.calculateSeats().current * weeksInYear * hourlyRate || 10000) // Provide fallback
+      max: Math.round(weeksInYear * this.calculateSeats().current * hourlyRate * 40 || 10000) // Max assumes 40 hours per week saved per seat
     };
 
     this.logCalculation(
@@ -809,9 +817,10 @@ RESULT:
         weeklyTimeSavedHrs: weeklyTimeSavedHrs,
         weeksInYear: weeksInYear,
         hourlyRate: hourlyRate,
+        annualSavingsCalculation: `${weeklyTimeSavedHrs} * ${weeksInYear} * ${hourlyRate} * ${adoptedDevs} = ${annualSavings}`,
         seatsCount: this.calculateSeats().current
       },
-      'Calculate weeklyTimeSavedHrs * weeksInYear * hourlyRate * adoptedDevs, set current = annualSavings, max = 80 * seats * 50',
+      'Calculate weeklyTimeSavedHrs * weeksInYear * hourlyRate * adoptedDevs (weeklyTimeSavedHrs includes default of 2 if needed)',
       result
     );
 
@@ -823,7 +832,7 @@ RESULT:
    */
   calculateProductivityOrThroughputBoostPercent(): Target {
     const adoptedDevs = this.calculateAdoptedDevs().current;
-    const weeklyTimeSavedHrs = this.calculateWeeklyTimeSavedHrs().current;
+    const weeklyTimeSavedHrs = this.calculateWeeklyTimeSavedHrs().current; // This now includes default of 2 if needed
 
     // Always parse hours per year as number
     const hoursPerYear = this.settings.hoursPerYear != null ? parseFloat(this.settings.hoursPerYear as any) : 2000;
@@ -844,13 +853,13 @@ RESULT:
     this.logCalculation(
       'PRODUCTIVITY OR THROUGHPUT BOOST PERCENT',
       {
-        adoptedDevsCount: adoptedDevs,                  
+        adoptedDevsCount: adoptedDevs,
         weeklyTimeSavedHrs: weeklyTimeSavedHrs,
         hoursPerWeek: hoursPerWeek,
         productivityBoostFactor: productivityBoost,
         productivityBoostPercent: productivityBoostPercent
       },
-      'Calculate boost factor as (hoursPerWeek + weeklyTimeSavedHrs) / hoursPerWeek, then convert to percentage by (factor - 1) * 100',
+      'Calculate boost factor as (hoursPerWeek + weeklyTimeSavedHrs) / hoursPerWeek, then convert to percentage by (factor - 1) * 100 (weeklyTimeSavedHrs includes default of 2 if needed)',
       result
     );
 

frontend/src/app/main/copilot/copilot-value-modeling/copilot-value-modeling.component.html

@@ -1,6 +1,14 @@
 <div class="page-container">
   <div class="page-header">
     <h1>Value Modeling & Targeting</h1>
+    <button mat-stroked-button color="warn" style="margin-left: 2rem;" (click)="resetTargets()">
+      <mat-icon>refresh</mat-icon>
+      Recalculate Targets
+    </button>
+    <button *ngIf="showSaveAllButton" mat-stroked-button color="primary" style="margin-left: 1rem;" (click)="saveTargets()">
+      <mat-icon>save</mat-icon>
+      Save All Targets
+    </button>
   </div>
 
   <h4 style="margin-top: 0">Org Metrics</h4>

frontend/src/app/main/copilot/copilot-value-modeling/copilot-value-modeling.component.ts

@@ -37,6 +37,7 @@ export class CopilotValueModelingComponent implements OnInit {
   orgDataSource: TableTarget[] = [];
   userDataSource: TableTarget[] = [];
   impactDataSource: TableTarget[] = [];
+  showSaveAllButton = false;
   private readonly _destroy$ = new Subject<void>();
   keyToNameMap: Record<string, string> = {
     seats: 'Seats',
@@ -128,7 +129,9 @@ export class CopilotValueModelingComponent implements OnInit {
 
   saveTargets() {
     const targets: Targets = this.transformBackToTargets(this.orgDataSource, this.userDataSource, this.impactDataSource);
-    this.targetsService.saveTargets(targets).subscribe();
+    this.targetsService.saveTargets(targets).subscribe(() => {
+      this.showSaveAllButton = false;
+    });
   }
 
   openEditDialog(target: Target) {
@@ -144,6 +147,17 @@ export class CopilotValueModelingComponent implements OnInit {
       }
     });
   }
+
+  resetTargets() {
+    // Call the backend endpoint to recalculate targets
+    this.targetsService.recalculateTargets().subscribe((result: any) => {
+      const targets = result.targets || result; // handle both {targets, logs} and just targets
+      this.orgDataSource = this.transformTargets(targets.org);
+      this.userDataSource = this.transformTargets(targets.user);
+      this.impactDataSource = this.transformTargets(targets.impact);
+      this.showSaveAllButton = true;
+    });
+  }
 }
 
 @Component({

frontend/src/app/main/copilot/copilot-value/time-saved-chart/time-saved-chart.component.ts

@@ -29,7 +29,7 @@ export class TimeSavedChartComponent implements OnInit, OnChanges {
         text: 'Time Saved (Hrs per Week)'
       },
       min: 0,
-      max: 10,
+      max: 10, // Will be updated dynamically
       labels: {
         format: '{value}hrs'
       },
@@ -45,7 +45,7 @@ export class TimeSavedChartComponent implements OnInit, OnChanges {
         }
       }],
       plotLines: [{
-        value: 5,
+        value: 5, // Will be updated dynamically
         color: 'var(--sys-primary)',
         dashStyle: 'Dash',
         width: 2,
@@ -91,6 +91,7 @@ export class TimeSavedChartComponent implements OnInit, OnChanges {
     this._chartOptions.yAxis = Object.assign({}, this.chartOptions?.yAxis, this._chartOptions.yAxis);
     this._chartOptions.tooltip = Object.assign({}, this.chartOptions?.tooltip, this._chartOptions.tooltip);
     this._chartOptions = Object.assign({}, this.chartOptions, this._chartOptions);
+    this.updateYAxisFromTargets();
   }
 
   ngOnChanges() {
@@ -101,6 +102,41 @@ export class TimeSavedChartComponent implements OnInit, OnChanges {
       };
       this.updateFlag = true;
     }
+    this.updateYAxisFromTargets();
+  }
+
+  private updateYAxisFromTargets() {
+    if (this.targets?.user?.weeklyTimeSavedHrs) {
+      const targetValue = this.targets.user.weeklyTimeSavedHrs.target;
+      const maxValue = Math.max(
+        targetValue * 1.5,
+        this.targets.user.weeklyTimeSavedHrs.max || 10,
+        10
+      );
+      const yAxis = {
+        ...this._chartOptions.yAxis,
+        max: maxValue,
+        plotLines: [{
+          value: targetValue,
+          color: 'var(--sys-primary)',
+          dashStyle: 'Dash' as Highcharts.DashStyleValue,
+          width: 2,
+          label: {
+            text: 'Target Level',
+            align: 'left' as Highcharts.AlignValue,
+            style: {
+              color: 'var(--sys-primary)'
+            }
+          },
+          zIndex: 2
+        }]
+      };
+      this._chartOptions = {
+        ...this._chartOptions,
+        yAxis
+      };
+      this.updateFlag = true;
+    }
   }
 
 }

frontend/src/app/services/api/targets.service.ts

@@ -77,5 +77,10 @@ export class TargetsService {
   saveTargets(targets: Targets) {
     return this.http.post<Targets>(`${this.apiUrl}`, targets);
   }
+
+  recalculateTargets() {
+    // Calls the backend endpoint to recalculate targets
+    return this.http.get<any>(`${this.apiUrl}/calculate`);
+  }
 }