fixed some calcs on the targeting page.

Author: MattG57

backend/src/__tests__/__mock__/seats-gen/mockSeatsGenerator.ts

@@ -69,7 +69,7 @@ import { randomInt } from 'crypto';
 
 
 
-        if (  Math.random() < (0.05 + Math.random() * .15 )) {
+        if (  Math.random() < (0.08 + Math.random() * .15 )) {
           seat.last_activity_editor = this.getRandomEditor();
 
           console.log('last_activity_at \n', seat.last_activity_at);

backend/src/__tests__/services/calendarClockServiceTests.ts

@@ -41,8 +41,8 @@ const metricsMockConfig: MockConfig = {
       trend: 'grow'
     },
     code_suggestions: {
-      baseValue: 1000,
-      range: { min: 150, max: 1200 },
+      baseValue: 700,
+      range: { min: 150, max: 1000 },
       trend: 'grow'
     },
     code_acceptances: {
@@ -56,8 +56,8 @@ const metricsMockConfig: MockConfig = {
       trend: 'stable'
     },
     code_lines_accepted: {
-      baseValue: 900,
-      range: { min: 750, max: 955 },
+      baseValue: 1200,
+      range: { min: 750, max: 1955 },
       trend: 'stable'
     },
     chats: {
@@ -81,8 +81,8 @@ const metricsMockConfig: MockConfig = {
       trend: 'grow'
     },
     total_code_reviews: {
-      baseValue: 100,
-      range: { min: 50, max: 100 },
+      baseValue: 50,
+      range: { min: 25, max: 100 },
       trend: 'grow'
     },
     total_code_review_comments: {

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

@@ -389,23 +389,23 @@ export class ValueModelingComponent implements OnInit, AfterViewInit {
       this.gridObject.max.percentMaxAdopted = this.calculatePercentage(this.gridObject.max.adoptedDevs as number, this.gridObject.max.seats as number);
       this.gridObject.max.annualTimeSavingsDollars = this.calculateAnnualTimeSavingsDollars(this.gridObject.max.weeklyTimeSaved as number, this.gridObject.max.adoptedDevs as number);
       this.gridObject.max.monthlyTimeSavings = this.calculateMonthlyTimeSavings(this.gridObject.max.adoptedDevs as number, this.gridObject.max.weeklyTimeSaved as number);
-      this.gridObject.max.productivityBoost = this.calculateProductivityBoost(this.gridObject.max.dailySuggestions as number, this.gridObject.max.dailyChatTurns as number);
+      this.gridObject.max.productivityBoost = this.calculateProductivityBoost(this.gridObject.max.weeklyTimeSaved as number, this.gridObject.max.seats as number, this.gridObject.max.adoptedDevs as number);
 
       // 2. Calculate Current column percentages and then Impacts
       this.gridObject.current.percentSeatsAdopted = this.calculatePercentage(this.gridObject.current.adoptedDevs as number, this.gridObject.current.seats as number);
       this.gridObject.current.percentSeatsReportingTimeSavings = this.calculatePercentage(this.gridObject.current.monthlyDevsReportingTimeSavings as number, this.gridObject.current.seats as number);
       this.gridObject.current.percentMaxAdopted = this.calculatePercentage(this.gridObject.current.adoptedDevs as number, this.gridObject.max.seats as number);
       this.gridObject.current.annualTimeSavingsDollars = this.calculateAnnualTimeSavingsDollars(this.gridObject.current.weeklyTimeSaved as number, this.gridObject.current.adoptedDevs as number);
       this.gridObject.current.monthlyTimeSavings = this.calculateMonthlyTimeSavings(this.gridObject.current.adoptedDevs as number, this.gridObject.current.weeklyTimeSaved as number);
-      this.gridObject.current.productivityBoost = this.calculateProductivityBoost(this.gridObject.current.dailySuggestions as number, this.gridObject.current.dailyChatTurns as number);
+      this.gridObject.current.productivityBoost = this.calculateProductivityBoost(this.gridObject.current.weeklyTimeSaved as number, this.gridObject.current.seats as number, this.gridObject.current.adoptedDevs as number);
 
       // 3. Calculate Target column values (percentages and then impacts)
       this.gridObject.target.percentSeatsAdopted = this.calculatePercentage(this.gridObject.target.adoptedDevs as number, this.gridObject.target.seats as number);
       this.gridObject.target.percentSeatsReportingTimeSavings = this.calculatePercentage(this.gridObject.target.monthlyDevsReportingTimeSavings as number, this.gridObject.target.seats as number);
       this.gridObject.target.percentMaxAdopted = this.calculatePercentage(this.gridObject.target.adoptedDevs as number, this.gridObject.target.seats as number);
       this.gridObject.target.annualTimeSavingsDollars = this.calculateAnnualTimeSavingsDollars(this.gridObject.target.weeklyTimeSaved as number, this.gridObject.target.adoptedDevs as number);
       this.gridObject.target.monthlyTimeSavings = this.calculateMonthlyTimeSavings(this.gridObject.target.adoptedDevs as number, this.gridObject.target.weeklyTimeSaved as number);
-      this.gridObject.target.productivityBoost = this.calculateProductivityBoost(this.gridObject.target.dailySuggestions as number, this.gridObject.target.dailyChatTurns as number);
+      this.gridObject.target.productivityBoost = this.calculateProductivityBoost(this.gridObject.target.weeklyTimeSaved as number, this.gridObject.target.seats as number, this.gridObject.target.adoptedDevs as number);
 
       // 4. Update the form values
       console.log('4. modelCalc: Updated gridObject:', this.gridObject);
@@ -425,17 +425,22 @@ export class ValueModelingComponent implements OnInit, AfterViewInit {
   }
 
   private calculateAnnualTimeSavingsDollars(weeklyTimeSaved: number, adoptedDevs: number): number {
-    const weeksInYear = 50; // TO DO: needs to come from settings
-    const hourlyRate = 50; // TO DO: needs to come from settings
+    const weeksInYear = 50; 
+    const hoursPerWeek = this.hoursPerYear / weeksInYear; 
+    const hourlyRate = this.devCostPerYear / this.hoursPerYear; 
     return weeklyTimeSaved * weeksInYear * hourlyRate * adoptedDevs;
   }
 
-  private calculateProductivityBoost(dailySuggestions: number, dailyChatTurns: number): number {
-    return dailySuggestions + dailyChatTurns; // Example calculation
-  }
+  private calculateProductivityBoost(weeklyTimeSaved: number, adoptedDevs: number, maxDevs: number): number {
+
+      return weeklyTimeSaved * adoptedDevs * 50 / (this.hoursPerYear * maxDevs || 1);
+    }
 
   private calculateMonthlyTimeSavings(adoptedDevs: number, weeklyTimeSaved: number): number {
-    return adoptedDevs * weeklyTimeSaved * 4;
+    const weeksInYear = 50; 
+    const weeksInMonth = 4;
+    const hoursPerWeek = this.hoursPerYear / weeksInYear; 
+    return weeklyTimeSaved * weeksInMonth * adoptedDevs;
   }
 
   toggleInputs(disable: boolean) {