Finish 7.0.0-beta.5

Author: thomaschampagne

appcore/modules/shared/models/sync/activity.model.ts

@@ -166,6 +166,7 @@ export class TrainingEffect {
 
 export class Scores {
   public stress: StressScores;
+  public powerHr?: number;
   public runningRating?: number;
   public swolf?: { 25?: number; 50?: number };
 }

appcore/modules/shared/sync/compute/activity-computer.ts

@@ -388,8 +388,7 @@ export class ActivityComputer {
     elapsedTime: number,
     sportType: ElevateSport,
     stats: ActivityStats,
-    athleteSetting: AthleteSettings,
-    streams: Streams
+    athleteSetting: AthleteSettings
   ): boolean {
     const isCycling = Activity.isRide(sportType);
     const isRunning = Activity.isRun(sportType);
@@ -404,19 +403,15 @@ export class ActivityComputer {
       return false;
     }
 
-    if (isCycling && streams && streams.watts && streams.watts.length > 0 && !(athleteSetting.cyclingFtp > 0)) {
+    if (isCycling && stats.power?.avg && !athleteSetting.cyclingFtp) {
       return true;
     }
 
-    if (
-      isRunning &&
-      streams?.grade_adjusted_speed?.length > 0 &&
-      (!(movingTime > 0) || !(athleteSetting.runningFtp > 0))
-    ) {
+    if (isRunning && stats.pace?.gapAvg && !athleteSetting.runningFtp) {
       return true;
     }
 
-    if (isSwimming && distance > 0 && movingTime > 0 && elapsedTime > 0 && !(athleteSetting.swimFtp > 0)) {
+    if (isSwimming && distance > 0 && movingTime > 0 && elapsedTime > 0 && !athleteSetting.swimFtp) {
       return true;
     }
 
@@ -984,6 +979,12 @@ export class ActivityComputer {
           )
         : null;
 
+    // Power/HR
+    scores.powerHr =
+      stats?.power?.avg && stats?.heartRate?.avg
+        ? _.round(stats?.power?.avg / stats?.heartRate?.avg, ActivityComputer.RND)
+        : null;
+
     // Swim SWOLF
     if (Activity.isSwim(type) && stats?.speed?.avg && stats?.cadence?.avgActive) {
       const secondsPer100m = Movement.speedToSwimPace(stats.speed.avg);

appcore/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "elevate-sports-app",
-  "version": "7.0.0-beta.4",
+  "version": "7.0.0-beta.5",
   "license": "MPL-2.0",
   "scripts": {
     "ng": "ng",

appcore/package.json

@@ -478,6 +478,16 @@ export namespace ActivityColumns {
         Print.number,
         1
       ).setDescription('"Running Rating" is an equivalent of "Running Index" from Polar'),
+      new NumberColumn(
+        Category.COMMON,
+        ["stats", "scores", "powerHr"],
+        null,
+        "Power/Hr",
+        Print.number,
+        2
+      ).setDescription(
+        "Avg power over avg heart rate. A higher value means you produced more power for a given heart rate."
+      ),
       new NumberColumn(Category.COMMON, ["stats", "calories"], null, "Calories", Print.number),
       new NumberColumn(Category.COMMON, ["stats", "caloriesPerHour"], null, "Calories / Hour", Print.number),
       new NumberColumn(Category.COMMON, ["stats", "moveRatio"], null, "Move Ratio", Print.number, 2),
@@ -749,11 +759,11 @@ export namespace ActivityColumns {
       new NumberColumn(
         Category.CADENCE,
         ["stats", "cadence", "activeRatio"],
-        "%",
+        null,
         "Active Cadence Ratio",
         Print.number,
         2
-      ).setDescription("Active cadence percentage when active"),
+      ).setDescription("Active cadence ratio"),
       new NumberColumn(Category.CADENCE, ["stats", "cadence", "max"], Definition.CADENCE_UNITS, "Max Cadence"),
       new NumberColumn(
         Category.CADENCE,
@@ -776,19 +786,19 @@ export namespace ActivityColumns {
       new NumberColumn(Category.CADENCE, ["stats", "cadence", "upperQ"], Definition.CADENCE_UNITS, "75% Cadence"),
       new NumberColumn(
         Category.CADENCE,
-        ["stats", "cadence", "slopeCadence", "up"],
+        ["stats", "grade", "slopeCadence", "up"],
         Definition.CADENCE_UNITS,
         "Avg Climbing Cadence"
       ),
       new NumberColumn(
         Category.CADENCE,
-        ["stats", "cadence", "slopeCadence", "flat"],
+        ["stats", "grade", "slopeCadence", "flat"],
         Definition.CADENCE_UNITS,
         "Avg Flat Cadence"
       ),
       new NumberColumn(
         Category.CADENCE,
-        ["stats", "cadence", "slopeCadence", "down"],
+        ["stats", "grade", "slopeCadence", "down"],
         Definition.CADENCE_UNITS,
         "Avg Downhill Cadence"
       ),
@@ -1117,7 +1127,7 @@ export namespace ActivityColumns {
         Category.OTHERS,
         ["stats", "scores", "stress", "trainingEffect", "anaerobic"],
         null,
-        "Aerobic Train. Effect",
+        "Anaerobic Train. Effect",
         Print.number,
         1
       ).setDescription("Anaerobic Training Effect"),

appcore/src/app/activities/activity-columns.namespace.ts

@@ -158,7 +158,7 @@
 
     <div>
       <div><strong>⚠️ What if I dont provide Functional Thresholds?</strong></div>
-      If you don't provide your <strong>Cycling, Running, Swim Functional Thresholds (FTPs)</strong> in the below
+      If you don't provide your <strong>Cycling, Running, Swim Functional Thresholds (FTPs)</strong> in the above
       settings, you will get <strong>EMPTY STRESS SCORES</strong> for activities performed without a heart rate monitor
       or a real power meter. This will result in a <strong>FLAT FITNESS TREND</strong> for instance.
     </div>

appcore/src/app/athlete-settings/components/dated-athlete-settings-manager/dated-athlete-settings-manager.component.html

@@ -10,6 +10,7 @@ export abstract class EssentialStatsGroup extends StatsGroup {
     StatsDef.Generic.movingTime,
     StatsDef.Generic.elapsedTime,
     StatsDef.Generic.moveRatio,
+    StatsDef.Scores.powerHr,
     StatsDef.Generic.calories,
     StatsDef.Generic.caloriesPerHour,
     StatsDef.Scores.Stress.aerobicTrainingEffect,

appcore/src/app/desktop/activity-view/shared/models/stats/groups/essential-stats-group.ts

@@ -840,6 +840,14 @@ export namespace StatsDef {
   }
 
   export namespace Scores {
+    export const powerHr = Stat.create<Scores>(
+      VoidSensor.DEFAULT,
+      "Power/Hr",
+      ["stats", "scores", "powerHr"],
+      "Avg power over avg heart rate. A higher value means you produced more power for a given heart rate.",
+      2
+    ).asEmptyUnit();
+
     export namespace Stress {
       const trainingEffectLabel = (value: number) => {
         if (value <= 0.9) {

appcore/src/app/desktop/activity-view/shared/models/stats/stats-def.namespace.ts

@@ -1,12 +1,14 @@
 import { DesktopMigration } from "./desktop-migrations.model";
 import { Upgrade_7_0_0$beta_3 } from "./upgrade_7_0_0-beta.3/upgrade_7_0_0-beta.3";
+import { Upgrade_7_0_0$beta_5 } from "./upgrade_7_0_0-beta.5/upgrade_7_0_0-beta.5";
 
 /**
  * Add desktop migrations inside LIST. The LIST is sorted from lowest to high versions
  */
 export class DesktopRegisteredMigrations {
   public static readonly LIST: DesktopMigration[] = [
-    new Upgrade_7_0_0$beta_3() // To version 7.0.0-beta.3
+    new Upgrade_7_0_0$beta_3(), // To version 7.0.0-beta.3
+    new Upgrade_7_0_0$beta_5() // To version 7.0.0-beta.5
     /* Next Upgrade Here */
   ];
 }

appcore/src/app/desktop/migration/desktop-registered-migrations.ts

@@ -0,0 +1,14 @@
+import { DesktopMigration } from "../desktop-migrations.model";
+import { Injector } from "@angular/core";
+
+export class Upgrade_7_0_0$beta_5 extends DesktopMigration {
+  public version: string = "7.0.0-beta.5";
+
+  public description: string = "Trigger recalculation for power/Hr new stats & settings lacks detection fix";
+
+  public requiresRecalculation: boolean = true;
+
+  public upgrade(db: LokiConstructor, injector: Injector): Promise<void> {
+    return Promise.resolve();
+  }
+}