Fix not showing badges when the session isn't filled

LiamMorrow · Nov 1, 2024 · 0dfddcb · 0dfddcb
1 parent 373adbe
commit 0dfddcb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/LiftLog.Ui/Pages/Index.razor b/LiftLog.Ui/Pages/Index.razor
@@ -56,7 +56,7 @@ else
                 <SessionSummaryTitle IsFilled="context.Item.IsStarted" Session="context.Item" />
             </TitleContent>
             <MainContent>
-                <SessionSummary ShowSets=true Session="context.Item"></SessionSummary>
+                <SessionSummary ShowSets=true Session="context.Item" IsFilled="false"></SessionSummary>
             </MainContent>
         </SplitCardControl>
     </CardList>

diff --git a/LiftLog.Ui/Shared/Presentation/ExerciseSummary.razor b/LiftLog.Ui/Shared/Presentation/ExerciseSummary.razor
@@ -1,14 +1,15 @@
-@{
-    var numberOfSetsCompleted = Exercise.PotentialSets.Count(s => s.Set != null);
-    var maxRepsCompleted = Exercise.PotentialSets.Max(s => s.Set?.RepsCompleted);
-
-    var allPerformedSetsHaveSameReps = Exercise.PotentialSets
-        .Where(x => x.Set != null)
-        .DistinctBy(x => x.Set?.RepsCompleted).Count() == 1;
-
+ @{
     var splitWeights = (Exercise.PerSetWeight
         && !Exercise.PotentialSets.All(s => s.Weight == Exercise.Weight))
-        || !allPerformedSetsHaveSameReps;
+        || Exercise.PotentialSets.DistinctBy(x=>x.Set?.RepsCompleted).Count() != 1;
+    var numCompletedSets = Exercise.PotentialSets.Count(x => x.Set != null);
+    var maxNumReps = Exercise.PotentialSets.Max(x => x.Set?.RepsCompleted ?? 0);
+
+    var (numSets, numReps) = IsFilled switch
+    {
+        true => (numCompletedSets, maxNumReps),
+        false => (Exercise.Blueprint.Sets, Exercise.Blueprint.RepsPerSet)
+    };
 }
 <span class="flex items-center">
     @if(ShowName)
@@ -23,8 +24,7 @@
 
             @if (ShowSets)
             {
-                <span>
-                    @(numberOfSetsCompleted)x@(maxRepsCompleted)
+                <span>@(numSets)x@(numReps)
                 </span>
                 @if(ShowWeight)
                 {
@@ -69,4 +69,6 @@
     [Parameter] public bool ShowWeight { get; set; }
 
     [Parameter] public bool ShowName { get; set; }
+
+    [Parameter] public bool IsFilled { get; set; } = true;
 }
diff --git a/LiftLog.Ui/Shared/Presentation/SessionSummary.razor b/LiftLog.Ui/Shared/Presentation/SessionSummary.razor
@@ -6,6 +6,7 @@
             Exercise=exercise
             ShowSets=ShowSets
             ShowWeight=ShowWeight
+            IsFilled=IsFilled
             ShowName=true />
         <md-divider class="last:hidden"></md-divider>
     }
@@ -18,4 +19,6 @@
     [Parameter] public bool ShowSets { get; set; }
 
     [Parameter] public bool ShowWeight { get; set; } = true;
+
+    [Parameter] public bool IsFilled { get; set; } = true;
 }