Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Add fixes on PDF reports and Leaderboard #192

Merged
merged 1 commit into from
Mar 13, 2024
+26 −19
Merged

Fix: Add fixes on PDF reports and Leaderboard #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...tend/quiz-master/app/reports/components/pdfReports/IndividualParticipantAnswersReport.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,13 @@ function ParticipantAnswersTableRow({
{ color: isParticipantCorrect ? "#17A14B" : "red" },
]}
>
{`${participantAnswer.answer} ${
isParticipantCorrect ? " ✅" : " ❌"
{`${isParticipantCorrect ? "✅ " : "❌ "} ${
participantAnswer.answer
}`}
</Text>
) : (
<Text style={[styles.answerColumn, { color: "grey" }]}>
{"<No answer submitted>"}
{"❌ <No answer submitted>"}
</Text>
)}

Expand Down
37 changes: 22 additions & 15 deletions WebApp/frontend/quiz_session/app/room/quiz/components/header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,30 +32,37 @@ export default function Header() {

return (
<div className="px-5 pt-2 w-full bg-green-600 ">
<div className="flex flex-row w-full justify-between">
<div className="flex justify-start">
<div className="flex flex-row w-full justify-between items-center">
<div className="flex flex-1">
<RoomPin />
</div>
<div className="flex justify-center">
<div className="flex-row flex bg-white items-center px-5 py-2 rounded-lg text-green_text ">
<div className="text-xl font-bold">
Question {metadata?.currentQuestionIndex}{" "}
<div className="justify-center items-center">
<p className="text-white text-sm mb-2">
{metadata?.currentSetName}
</p>
<div className="flex-row flex bg-white py-2 rounded-md text-green_text flex-2 justify-center items-center">
<div className="text-base font-bold">
Question {metadata?.currentQuestionIndex}{" "}
</div>
<div>&nbsp; out of {metadata?.totalNumberOfQuestions}</div>
</div>
<div>&nbsp; out of {metadata?.totalNumberOfQuestions}</div>
</div>
</div>
<div
className={`flex flex-col rounded-md px-4 py-2 w-28 justify-center items-center ${
time > 10 ? " bg-green-700/50" : "bg-red-500"
}`}
>
<div className="text-white text-sm">Time left</div>
<div className="flex flex-1 justify-end">
<div
className={`text-2xl font-bold text-white ${
time <= 5 && time > 0 ? "animate-ping" : ""
className={`flex flex-col rounded-md px-4 py-2 w-28 justify-center items-center ${
time > 10 ? " bg-green-700/50" : "bg-red-500"
}`}
>
{timeFormater(time)}
<div className="text-white text-sm">Time left</div>
<div
className={`text-2xl font-bold text-white ${
time <= 5 && time > 0 ? "animate-ping" : ""
}`}
>
{timeFormater(time)}
</div>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion WebApp/frontend/quiz_session/app/room/quiz/components/leaderboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export default function Leaderboard({ leaderBoard }) {

return (
<div className="h-full w-full flex justify-center items-center ">
<AnimateSlideInFromBottom className="w-[90%] sm:w-[75%] md:w-[45%] lg:w-[50%] xl:w-1/3 h-3/4 max-w-[460px] bg-white rounded-lg shadow-2xl shadow-green-600">
<AnimateSlideInFromBottom className="w-[90%] sm:w-[75%] md:w-[45%] lg:w-[50%] xl:w-1/3 h-3/4 max-w-[460px] bg-white rounded-lg shadow-2xl shadow-green-600 overflow-y-scroll">
<div className="p-5 overflow-auto space-y-5">
<div className="flex flex-row justify-between">
<div className="font-bold">Leaderboard</div>
Expand Down
Loading