From 36b715ca0db55e31ad3f3111e24642401d141954 Mon Sep 17 00:00:00 2001
From: GOEPP THOMAS <thomas@saturne-digital.fr>
Date: Fri, 17 Jan 2025 10:05:23 +0100
Subject: [PATCH] fix: end quiz multi and question count
---
components/PlayingQuiz/EndQuiz/EndQuizListPlayer.tsx | 2 ++
screens/Multiplayer/Lobby/Lobby.tsx | 5 +++--
.../Lobby/PlayingQuizMultiMode/PlayingQuizMultiMode.tsx | 2 +-
.../InformationsOfQuiz/MultiInformationsOfQuiz.tsx | 2 +-
screens/Multiplayer/OnlineQuiz/OnlineCreateLobby.tsx | 1 +
screens/Multiplayer/OnlineQuiz/OnlinePlayQuiz.tsx | 1 +
screens/PlayingQuiz/EndQuizMulti/EndQuizMultiChild.tsx | 1 -
7 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/components/PlayingQuiz/EndQuiz/EndQuizListPlayer.tsx b/components/PlayingQuiz/EndQuiz/EndQuizListPlayer.tsx
index a55009b..4db6704 100644
--- a/components/PlayingQuiz/EndQuiz/EndQuizListPlayer.tsx
+++ b/components/PlayingQuiz/EndQuiz/EndQuizListPlayer.tsx
@@ -9,6 +9,7 @@ interface Props {
}
export default function EndQuizListPlayer({ users, maxScore }: Props) {
+
const renderUser = ({ item, index }: { item: UserEndQuiz; index: number }) => (
<View style={[styles.userContainer, index === 0 && styles.firstPlace]}>
<Image
@@ -41,6 +42,7 @@ export default function EndQuizListPlayer({ users, maxScore }: Props) {
const styles = StyleSheet.create({
container: {
width: "100%",
+ height: "35%",
padding: 20,
backgroundColor: "#fff",
borderRadius: 20,
diff --git a/screens/Multiplayer/Lobby/Lobby.tsx b/screens/Multiplayer/Lobby/Lobby.tsx
index 1c77010..dc2638d 100644
--- a/screens/Multiplayer/Lobby/Lobby.tsx
+++ b/screens/Multiplayer/Lobby/Lobby.tsx
@@ -25,6 +25,7 @@ type RoutePropsType = {
roomId?: string;
nbPlayers: number;
isHost: boolean;
+ questionCount: number;
};
};
@@ -35,7 +36,7 @@ interface GenerateRunData {
export default function Lobby({navigation, route}: Props) {
- const { quizId, roomId, nbPlayers, isHost} = route.params;
+ const { quizId, roomId, nbPlayers, isHost, questionCount} = route.params;
const [players, setPlayers] = useState<User[]>([{ id: 0, username: 'Invite', email: 'invite@email.com'}]);
const [socket, setSocket] = useState<Socket | null>(null);
@@ -70,7 +71,7 @@ export default function Lobby({navigation, route}: Props) {
setRunId(responseGenerate);
// navigation.navigate("PlayingQuizMultiMode", {runId: responseGenerate, questionCount:event.data.questionCount, es: es, roomId: roomId, isHost: true});
- navigation.navigate("PlayingQuizMultiMode", {runId: responseGenerate, questionCount: 10, es: es, roomId: roomId, isHost: isHost});
+ navigation.navigate("PlayingQuizMultiMode", {runId: responseGenerate, questionCount: questionCount, es: es, roomId: roomId, isHost: isHost});
});
es.addEventListener("userJoined", (event) => {
diff --git a/screens/Multiplayer/Lobby/PlayingQuizMultiMode/PlayingQuizMultiMode.tsx b/screens/Multiplayer/Lobby/PlayingQuizMultiMode/PlayingQuizMultiMode.tsx
index c771a44..51075b7 100644
--- a/screens/Multiplayer/Lobby/PlayingQuizMultiMode/PlayingQuizMultiMode.tsx
+++ b/screens/Multiplayer/Lobby/PlayingQuizMultiMode/PlayingQuizMultiMode.tsx
@@ -91,7 +91,7 @@ export default function PlayingQuizMultiMode({route, navigation}:Props) {
<TemplateDuo
childrenHeader={<PlayingQuizMultiModeHeader quizInformations={quizInformations} runId={runId}
actualQuestion={actualQuestion} score={score}
- navigation={navigation} questionCount={10}></PlayingQuizMultiModeHeader>}
+ navigation={navigation} questionCount={questionCount}></PlayingQuizMultiModeHeader>}
childrenBody={<PlayingQuizMultiModeBody runId={runId} actualQuestion={actualQuestion} es={es}
fetchActualQuestion={() => {
}} roomId={roomId} isHost={isHost}
diff --git a/screens/Multiplayer/MultiplayerCommunity/InformationsOfQuiz/MultiInformationsOfQuiz.tsx b/screens/Multiplayer/MultiplayerCommunity/InformationsOfQuiz/MultiInformationsOfQuiz.tsx
index ca222f4..2bc8e86 100644
--- a/screens/Multiplayer/MultiplayerCommunity/InformationsOfQuiz/MultiInformationsOfQuiz.tsx
+++ b/screens/Multiplayer/MultiplayerCommunity/InformationsOfQuiz/MultiInformationsOfQuiz.tsx
@@ -29,7 +29,7 @@ export default function MultiInformationsOfQuiz({ navigation, route }: Props) {
const onPlayPressed = async (nbPlayer: number) => {
setShowModal(false);
- navigation.navigate("Lobby", {quizId: quiz.id, roomId: null, nbPlayer: nbPlayer, isHost: true});
+ navigation.navigate("Lobby", {quizId: quiz.id, roomId: null, nbPlayer: nbPlayer, isHost: true, questionCount: quiz.questionCount});
};
return (
diff --git a/screens/Multiplayer/OnlineQuiz/OnlineCreateLobby.tsx b/screens/Multiplayer/OnlineQuiz/OnlineCreateLobby.tsx
index 7f7e8ee..3f178c4 100644
--- a/screens/Multiplayer/OnlineQuiz/OnlineCreateLobby.tsx
+++ b/screens/Multiplayer/OnlineQuiz/OnlineCreateLobby.tsx
@@ -65,6 +65,7 @@ export default function OnlineCreateLobby({navigation}: Props) {
roomId: null,
nbPlayers: parseInt(nbPlayers),
isHost: true,
+ questionCount:nbQuestions
});
};
diff --git a/screens/Multiplayer/OnlineQuiz/OnlinePlayQuiz.tsx b/screens/Multiplayer/OnlineQuiz/OnlinePlayQuiz.tsx
index c91647d..e7c8da2 100644
--- a/screens/Multiplayer/OnlineQuiz/OnlinePlayQuiz.tsx
+++ b/screens/Multiplayer/OnlineQuiz/OnlinePlayQuiz.tsx
@@ -35,6 +35,7 @@ export default function OnlinePlayQuiz({navigation}: Props) {
roomId: codeQuiz,
nbPlayers: 10,
isHost: false,
+ questionCount: 10
});
};
diff --git a/screens/PlayingQuiz/EndQuizMulti/EndQuizMultiChild.tsx b/screens/PlayingQuiz/EndQuizMulti/EndQuizMultiChild.tsx
index 866d9bd..da12536 100644
--- a/screens/PlayingQuiz/EndQuizMulti/EndQuizMultiChild.tsx
+++ b/screens/PlayingQuiz/EndQuizMulti/EndQuizMultiChild.tsx
@@ -18,7 +18,6 @@ interface Props {
export default function EndQuizMultiChild({ navigation, users, questionCount}: Props) {
- const userTest = {id: 1, email: "user1@email.com", username: "user1", stats: undefined};
const handleBackToMenu = () => {
navigation.navigate('TabNavigator');
--
GitLab