@dgpholdings/greatoak-shared 1.1.117 → 1.1.119

package/dist/types/TApiClientProgress.d.ts

@@ -59,6 +59,21 @@ export type TApiGetTrainerClientListRes = {
 export type TApiTrainerGetClientWorkoutHistoryReq = {
     clientId: string;
 };
+export type TExerciseScore = {
+    exerciseId: string;
+    score: number;
+    muscleScores: {
+        [muscleGroup: string]: number;
+    };
+};
+export type TRecentSession = {
+    createdAt: Date;
+    userDuration: number;
+    planId: string | null;
+    isOwnPlan: boolean;
+    sessionRecord?: TClientSessionData[];
+    exerciseScores?: TExerciseScore[];
+};
 export type TApiTrainerGetClientWorkoutHistoryRes = {
     status: 200;
     state: "success";
@@ -66,6 +81,7 @@ export type TApiTrainerGetClientWorkoutHistoryRes = {
     fullName?: string;
     clientEmail?: string;
     history: Pick<TClientWorkoutHistory, "totalCompletedSessions" | "planId" | "sessions">[];
+    recentSessions: TRecentSession[];
 } | {
     status: 400 | 500;
     message?: string;

package/dist/types/TApiTemplateShop.d.ts

@@ -17,6 +17,7 @@ export type TTemplateShopDb = {
         es?: string;
         fr?: string;
     };
+    planId: string;
     planCode: string;
     gender: "male" | "female" | "all";
     slug: string;

package/dist/utils/scoring.utils.js

@@ -56,7 +56,7 @@ const calculateExerciseScore = (param) => {
     const avgIntensity = calculateAverageIntensity(completedSets, exercise, user);
     const setQuality = calculateSetQuality(completedSets);
     // Calculate muscle fatigue scores
-    const muscleScores = calculateMuscleScores(exercise, completedSets, totalVolume);
+    const muscleScores = calculateMuscleScores(exercise, completedSets, totalVolume, user);
     // Final score composition
     const volumeComponent = normalizeVolume(totalVolume, exercise, user) * 0.35;
     const intensityComponent = avgIntensity * 0.35;
@@ -231,18 +231,22 @@ const calculateSetQuality = (record) => {
         qualityScore += 3;
     return Math.min(100, Math.max(0, qualityScore));
 };
-const calculateMuscleScores = (exercise, record, totalVolume) => {
+const calculateMuscleScores = (exercise, record, totalVolume, user) => {
     const muscleScores = {};
     const volumePerSet = totalVolume / record.length;
+    // Normalize volume by bodyweight if available
+    const normalizedVolumePerSet = user.weightKg
+        ? volumePerSet / (user.weightKg * 10)
+        : volumePerSet / 500; // Fallback to absolute scale
     // Primary muscles take 70% of the fatigue
     exercise.primaryMuscles.forEach((muscle) => {
-        const baseFatigue = Math.min(100, (volumePerSet / 500) * 70);
+        const baseFatigue = Math.min(100, normalizedVolumePerSet * 70);
         const setMultiplier = Math.min(1.5, 1 + (record.length - 1) * 0.15);
         muscleScores[muscle] = Math.min(100, baseFatigue * setMultiplier);
     });
     // Secondary muscles take 30% of the fatigue
     exercise.secondaryMuscles.forEach((muscle) => {
-        const baseFatigue = Math.min(100, (volumePerSet / 500) * 30);
+        const baseFatigue = Math.min(100, normalizedVolumePerSet * 30);
         const setMultiplier = Math.min(1.3, 1 + (record.length - 1) * 0.1);
         muscleScores[muscle] = Math.min(100, baseFatigue * setMultiplier);
     });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dgpholdings/greatoak-shared",
-	"version": "1.1.117",
+	"version": "1.1.119",
 	"description": "Shared TypeScript types and utilities for @dgpholdings projects",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",