Merge pull request #299 from LiamMorrow/dont-interrupt-plan-with-free…

…form
LiamMorrow · Oct 15, 2024 · e7a9de7 · e7a9de7
2 parents 60c31a3 + 88984df
commit e7a9de7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/LiftLog.Lib/Models/SessionModels.cs b/LiftLog.Lib/Models/SessionModels.cs
@@ -115,6 +115,8 @@ public RecordedExercise? NextExercise
         RecordedExercises.Sum(ex =>
             ex.PotentialSets.Sum(set => (set.Set?.RepsCompleted ?? 0) * set.Weight)
         );
+
+    public bool IsFreeform => Blueprint.Name == "Freeform Session";
 }
 
 public record RecordedExercise(

diff --git a/LiftLog.Ui/Services/SessionService.cs b/LiftLog.Ui/Services/SessionService.cs
@@ -32,7 +32,9 @@ ImmutableListValue<SessionBlueprint> sessionBlueprints
         var latestSession = currentSession switch
         {
             { IsStarted: true } => currentSession,
-            _ => await progressRepository.GetOrderedSessions().FirstOrDefaultAsync(),
+            _ => await progressRepository
+                .GetOrderedSessions()
+                .FirstOrDefaultAsync(x => !x.IsFreeform),
         };
         if (latestSession == null)
         {