From 71b6539ca9e5c75227ace65dfaf681f2a6d62ef5 Mon Sep 17 00:00:00 2001 From: paulkreft Date: Mon, 26 Feb 2024 18:21:18 +0100 Subject: [PATCH 1/2] fix average time stat display (again) --- .../paulkreft/backend/statistic/service/StatisticService.java | 4 ++-- .../backend/statistic/service/StatisticServiceTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/de/neuefische/paulkreft/backend/statistic/service/StatisticService.java b/backend/src/main/java/de/neuefische/paulkreft/backend/statistic/service/StatisticService.java index 9733d43..a72a08c 100644 --- a/backend/src/main/java/de/neuefische/paulkreft/backend/statistic/service/StatisticService.java +++ b/backend/src/main/java/de/neuefische/paulkreft/backend/statistic/service/StatisticService.java @@ -64,8 +64,8 @@ private ScoreMap getAverageDurations(List easyGames, List mediumGame List hardDurations = hardGames.stream().map(game -> Double.valueOf(game.duration())).filter(d -> d != 0).toList(); Double averageDurationEasy = !easyDurations.isEmpty() ? easyDurations.stream().mapToDouble(v -> v).sum() / easyDurations.size() : null; - Double averageDurationMedium = !mediumDurations.isEmpty() ? mediumDurations.stream().mapToDouble(v -> v).sum() / easyDurations.size() : null; - Double averageDurationHard = !hardDurations.isEmpty() ? hardDurations.stream().mapToDouble(v -> v).sum() / easyDurations.size() : null; + Double averageDurationMedium = !mediumDurations.isEmpty() ? mediumDurations.stream().mapToDouble(v -> v).sum() / mediumDurations.size() : null; + Double averageDurationHard = !hardDurations.isEmpty() ? hardDurations.stream().mapToDouble(v -> v).sum() / hardDurations.size() : null; return new ScoreMap(averageDurationEasy, averageDurationMedium, averageDurationHard); } diff --git a/backend/src/test/java/de/neuefische/paulkreft/backend/statistic/service/StatisticServiceTest.java b/backend/src/test/java/de/neuefische/paulkreft/backend/statistic/service/StatisticServiceTest.java index 637c24b..d717d1b 100644 --- a/backend/src/test/java/de/neuefische/paulkreft/backend/statistic/service/StatisticServiceTest.java +++ b/backend/src/test/java/de/neuefische/paulkreft/backend/statistic/service/StatisticServiceTest.java @@ -58,7 +58,7 @@ void getUserClassicStatisticsTest_whenAllStatisticsCalculable_returnCorrectValue new ScoreMap(12.0, 3.0, 6.0), new ScoreMap(7.0, 2.0, 1.0), new ScoreMap(3632.0, 8578.0, 15833.0), - new ScoreMap(6866.285714285715, 3611.0, 2261.8571428571427) + new ScoreMap(6866.285714285715, 12638.5, 15833.0) ); // When From a6fa7970a98aeaa464f15d2e0d36f1e5cba7eb08 Mon Sep 17 00:00:00 2001 From: paulkreft Date: Mon, 26 Feb 2024 18:22:43 +0100 Subject: [PATCH 2/2] fix loading state on profile --- frontend/src/components/Profile.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/Profile.tsx b/frontend/src/components/Profile.tsx index 41e66d3..1d2a49c 100644 --- a/frontend/src/components/Profile.tsx +++ b/frontend/src/components/Profile.tsx @@ -3,6 +3,7 @@ import { User } from "../types/User.ts"; import axios from "axios"; import { Statistics } from "../types/Statistics.ts"; import { Statistic } from "./Statistic.tsx"; +import { Spinner } from "./Spinner.tsx"; type PlayProps = { user: User; @@ -36,7 +37,11 @@ export const Profile: React.FC = ({ user }) => { }, [user]); if (user == null || !statistics) { - return
loading
; + return ( +
+ +
+ ); } return (