diff --git a/Tevling/Components/ActivityCard.razor.cs b/Tevling/Components/ActivityCard.razor.cs index 25bc4af..3e23ca2 100644 --- a/Tevling/Components/ActivityCard.razor.cs +++ b/Tevling/Components/ActivityCard.razor.cs @@ -6,7 +6,7 @@ public partial class ActivityCard : ComponentBase [Parameter] public Activity? Activity { get; set; } - private string? ActivityTime; + private string? ActivityTime { get; set; } private string Stats { @@ -32,9 +32,9 @@ private string Time { get { - if (Activity is null || Activity.Details.ElapsedTimeInSeconds <= 0) return string.Empty; + if (Activity?.Details.MovingTimeInSeconds is null or <= 0) return string.Empty; - TimeSpan timeSpan = TimeSpan.FromSeconds(Activity.Details.ElapsedTimeInSeconds); + TimeSpan timeSpan = TimeSpan.FromSeconds(Activity.Details.MovingTimeInSeconds); string formattedTime = ""; if (timeSpan.Hours > 0) diff --git a/Tevling/Services/ChallengeService.cs b/Tevling/Services/ChallengeService.cs index 72a885a..4228031 100644 --- a/Tevling/Services/ChallengeService.cs +++ b/Tevling/Services/ChallengeService.cs @@ -255,7 +255,7 @@ operation which EFCore requires. Sum = result.Challenge.Measurement switch { ChallengeMeasurement.Distance => a.Activities.Select(x => x.Details.DistanceInMeters).Sum(), - ChallengeMeasurement.Time => a.Activities.Select(x => x.Details.ElapsedTimeInSeconds).Sum(), + ChallengeMeasurement.Time => a.Activities.Select(x => x.Details.MovingTimeInSeconds).Sum(), ChallengeMeasurement.Elevation => a.Activities.Select(x => x.Details.TotalElevationGain).Sum(), _ => 0 } @@ -313,7 +313,7 @@ operation which EFCore requires. athleteTickets += (int)activity.Details.TotalElevationGain; // 1 m = 1 ticket break; case ChallengeMeasurement.Time: - athleteTickets += activity.Details.ElapsedTimeInSeconds / 1800; // 30 min = 1 ticket + athleteTickets += activity.Details.MovingTimeInSeconds / 1800; // 30 min = 1 ticket break; default: athleteTickets += 0; @@ -331,7 +331,7 @@ operation which EFCore requires. { currentMax += Tickets; if (randomNumber > currentMax) continue; - + challenge.WinnerId = Athlete.Id; await dataContext.UpdateChallengeAsync(challenge, CancellationToken.None);