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

Develop #202

Merged
merged 11 commits into from
Apr 27, 2024
Merged

Develop #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d7f3362
Adding more graphics
uo276976 Apr 23, 2024
df41f84
updated bar graphic
uo276976 Apr 25, 2024
d732a74
updating participation
uo276976 Apr 26, 2024
1efd841
game service test update
uo276976 Apr 26, 2024
ffc7a3a
fixing participation
uo276976 Apr 26, 2024
a5ca370
Table adapted to mobiles
UO287687 Apr 26, 2024
efde1d5
Deleted bar graphic
uo276976 Apr 27, 2024
584733d
css change
UO287687 Apr 27, 2024
cf750a9
Merge pull request #201 from Arquisoft/Develop-Participation2
UO287687 Apr 27, 2024
95dd712
i18n-steps updated
UO287687 Apr 27, 2024
00057f2
Merge branch 'Develop' of github.uniovi.com:Arquisoft/wiq_es3b into D…
UO287687 Apr 27, 2024
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
19 changes: 17 additions & 2 deletions gameservice/game-service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,28 @@ app.get('/getParticipation/:userId', async (req, res) => {
{
$group: {
_id: null,
totalGames: { $sum: 1 }, //$sum -> Retorna la suma de los valores numéricos
totalGames: { $sum: 1 },
correctAnswers: { $sum: "$pAcertadas" },
incorrectAnswers: { $sum: "$pFalladas" },
totalTime: { $sum: "$totalTime" },
classic: {
$sum: { $cond: [{ $eq: ["$gameMode", "classic"] }, 1, 0] }
},
infinite: {
$sum: { $cond: [{ $eq: ["$gameMode", "infinite"] }, 1, 0] }
},
threeLife: {
$sum: { $cond: [{ $eq: ["$gameMode", "threeLife"] }, 1, 0] }
},
category: {
$sum: { $cond: [{ $eq: ["$gameMode", "category"] }, 1, 0] }
},
custom: {
$sum: { $cond: [{ $eq: ["$gameMode", "custom"] }, 1, 0] }
}
},
},
]);
]);

if (participationData.length === 0 || (participationData.length > 0 && participationData[0].totalGames === 0)) {
// No se encontraron datos para el usuario
Expand Down
11 changes: 9 additions & 2 deletions gameservice/game-service.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ beforeEach(async () => {
pAcertadas: 5,
pFalladas: 3,
totalTime: 1200,
gameMode: 'normal'
gameMode: 'classic'
});
});

Expand All @@ -54,7 +54,7 @@ describe('Game Service', () => {
pAcertadas: 5,
pFalladas: 3,
totalTime: 1200,
gameMode: 'normal'
gameMode: 'classic'
};

const response = await request(app).post('/addgame').send(newGame);
Expand All @@ -79,8 +79,15 @@ describe('Game Service', () => {
correctAnswers: 5,
incorrectAnswers: 3,
totalTime: 1200,
classic: 1,
infinite: 0,
threeLife: 0,
category: 0,
custom: 0,
};



const response = await request(app).get(`/getParticipation/${userId}`);

expect(response.status).toBe(200);
Expand Down
9 changes: 0 additions & 9 deletions webapp/e2e/steps/i18n-steps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,6 @@ defineFeature(feature, test => {

then('A Classic Game message should be shown in different languages', async () => {
await expect(page).toMatchElement("span", { text: "Juego Clásico" });

await page.waitForSelector('button.menuLeft', { text: '' });
await expect(page).toClick('button.menuLeft', { text: '' });

await page.waitForSelector('div.languageButton', { text: '' });
await expect(page).toClick('div.languageButton', { text: '' });
await page.waitForSelector('li', { text: 'Italiano' });
await expect(page).toClick('li', { text: 'Italiano' });
await expect(page).toMatchElement("span", { text: "Gioco Classico" });
});
})

Expand Down
109 changes: 56 additions & 53 deletions webapp/src/components/Participation.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import axios from 'axios';
import '../css/participation.css';
import { SessionContext } from '../SessionContext';
import { FormattedMessage } from 'react-intl';
import Typography from '@mui/material/Typography';
import Table from '@mui/material/Table';
import TableBody from '@mui/material/TableBody';
import TableCell from '@mui/material/TableCell';
Expand Down Expand Up @@ -43,61 +44,63 @@ export const Participation = ({ goTo }) => {
return (
<main className="Participation-container">
<div>
<h1 className="Participation-title"><FormattedMessage id="participationTitle" /></h1>
<Typography id="participationTitle" sx={{ textAlign: 'center', fontSize:'2em', margin:'0 0 0.3em 0 !important', color:'#8f95fd' }}>
<FormattedMessage id="participationTitle" />
</Typography>

{loading ? (
<p><FormattedMessage id={participationData ? "loadingData" : "noParticipationData"} className="Participation-text"/></p>
) : (
participationData !== null ? (
<div className="Participation-text">
<TableContainer component={Paper}>
<Table className='tablePost' sx={{ minWidth: '30vw' }} aria-label="simple table">
<TableBody>
<TableRow key={"Total Games"} sx={{ '&:last-child td, &:last-child th': { border: 0 } }}>
<TableCell sx={{ fontSize:'1.2em' }}><FormattedMessage id="totalGames" /></TableCell>
<TableCell sx={{ fontSize:'1.2em' }} align="right">{participationData.totalGames}</TableCell>
</TableRow>
<TableRow key={"Correct Answers"} sx={{ '&:last-child td, &:last-child th': { border: 0 } }}>
<TableCell sx={{ fontSize:'1.2em' }}><FormattedMessage id="correctAnswers" /></TableCell>
<TableCell sx={{ fontSize:'1.2em' }} align="right">{participationData.correctAnswers}</TableCell>
</TableRow>
<TableRow key={"Incorrect Answers"} sx={{ '&:last-child td, &:last-child th': { border: 0 } }}>
<TableCell sx={{ fontSize:'1.2em' }}><FormattedMessage id="incorrectAnswers" /></TableCell>
<TableCell sx={{ fontSize:'1.2em' }} align="right">{participationData.incorrectAnswers}</TableCell>
</TableRow>
<TableRow key={"Total Time"} sx={{ '&:last-child td, &:last-child th': { border: 0 } }}>
<TableCell sx={{ fontSize:'1.2em' }}><FormattedMessage id="totalTime" /></TableCell>
<TableCell sx={{ fontSize:'1.2em' }} align="right">{participationData.totalTime} <FormattedMessage id="seconds" /></TableCell>
</TableRow>
</TableBody>
</Table>
</TableContainer>
<div data-testid="pie-chart" className="recharts-wrapper">
<PieChart width={400} height={400}>
<Pie
data={[
{ name: <FormattedMessage id="correctAnswers" />, value: participationData.correctAnswers },
{ name: <FormattedMessage id="incorrectAnswers" />, value: participationData.incorrectAnswers }
]}
dataKey="value"
nameKey="name"
cx="50%"
cy="50%"
outerRadius={80}
label
labelLine={false}
>
<Cell fill="#82ca9d" /> {/* Color verde para Respuestas Correctas */}
<Cell fill="#ff6b6b" /> {/* Color rojo para Respuestas Incorrectas */}
</Pie>
<Tooltip />
</PieChart>
</div>
</div>
{loading ? (
<p><FormattedMessage id={participationData ? "loadingData" : "noParticipationData"} className="Participation-text"/></p>
) : (
<p><FormattedMessage id="noParticipationData" className="Participation-text"/></p>
)
)}
participationData !== null ? (
<div className="Participation-text">
<TableContainer component={Paper} className='tableContainer'>
<Table className='tablePost' sx={{ minWidth: '30vw' }} aria-label="simple table">
<TableBody>
<TableRow key={"Total Games"} sx={{ '&:last-child td, &:last-child th': { border: 0 } }}>
<TableCell sx={{ fontSize:'1.2em' }}><FormattedMessage id="totalGames" /></TableCell>
<TableCell sx={{ fontSize:'1.2em' }} align="right">{participationData.totalGames}</TableCell>
</TableRow>
<TableRow key={"Correct Answers"} sx={{ '&:last-child td, &:last-child th': { border: 0 } }}>
<TableCell sx={{ fontSize:'1.2em' }}><FormattedMessage id="correctAnswers" /></TableCell>
<TableCell sx={{ fontSize:'1.2em' }} align="right">{participationData.correctAnswers}</TableCell>
</TableRow>
<TableRow key={"Incorrect Answers"} sx={{ '&:last-child td, &:last-child th': { border: 0 } }}>
<TableCell sx={{ fontSize:'1.2em' }}><FormattedMessage id="incorrectAnswers" /></TableCell>
<TableCell sx={{ fontSize:'1.2em' }} align="right">{participationData.incorrectAnswers}</TableCell>
</TableRow>
<TableRow key={"Total Time"} sx={{ '&:last-child td, &:last-child th': { border: 0 } }}>
<TableCell sx={{ fontSize:'1.2em' }}><FormattedMessage id="totalTime" /></TableCell>
<TableCell sx={{ fontSize:'1.2em' }} align="right">{participationData.totalTime} <FormattedMessage id="seconds" /></TableCell>
</TableRow>
</TableBody>
</Table>
</TableContainer>
<div data-testid="pie-chart" className="recharts-wrapper" style={{ display: 'flex', justifyContent: 'center' }}>
<PieChart width={400} height={400}>
<Pie
data={[
{ name: <FormattedMessage id="correctAnswers" />, value: participationData.correctAnswers },
{ name: <FormattedMessage id="incorrectAnswers" />, value: participationData.incorrectAnswers }
]}
dataKey="value"
nameKey="name"
cx="50%"
cy="50%"
outerRadius={80}
label
labelLine={false}
>
<Cell fill="#82ca9d" /> {/* Color verde para Respuestas Correctas */}
<Cell fill="#ff6b6b" /> {/* Color rojo para Respuestas Incorrectas */}
</Pie>
<Tooltip />
</PieChart>
</div>
</div>
) : (
<p><FormattedMessage id="noParticipationData" className="Participation-text"/></p>
)
)}
</div>
</main>
);
Expand Down
27 changes: 9 additions & 18 deletions webapp/src/css/participation.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,11 @@
.Participation-container {
margin-top: 50px;
display: flex;
flex-direction: column;
gap: 10px;
@media screen and (max-width: 768px) {
.tablePost {
font-size: 0.8rem;
}

.Participation-title {
color: #8f95fd;
padding: 0 1em;
text-align: center;
font-size: 1.4em;
.Participation-text{
width: 100vmin;
}
#participationTitle{
padding-top: 60px;
}

.Participation-text {
font-size: 1.4em;
text-align: center;
line-height: 1;
}

}
1 change: 0 additions & 1 deletion webapp/src/test/Participation.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { Participation } from '../components/Participation';
import { SessionContext } from '../SessionContext';
import { IntlProvider } from 'react-intl';
import messages_en from '../messages/messages_en.json';
import { FormattedMessage } from 'react-intl';

jest.mock('axios');

Expand Down