diff --git a/back/src/controllers/equipe.controller.js b/back/src/controllers/equipe.controller.js index 881a69d0734e1f65eddadbc1412cfced168fc62b..2bc788496df7ec3b1e0cccf85c0f9c5ae10f85f9 100644 --- a/back/src/controllers/equipe.controller.js +++ b/back/src/controllers/equipe.controller.js @@ -28,8 +28,10 @@ function getClassementEquipe(req, res) { if (data.id in leader_team) { if (leader_team[data.id].participants.indexOf(data.partId) == -1) { leader_team[data.id].participants.unshift(data.partId); + if (data.id != 'sprint') { leader_team[data.id].nbParticipant += 1; } + } leader_team[data.id].score += data.score; leader_team[data.id].nbScores += 1; } else { diff --git a/front/src/components/Classement/ClassementEquipe.js b/front/src/components/Classement/ClassementEquipe.js index d62d86415db2e7eec4543e91a42a65cd171e9c62..f2e0d6730d3e76c8a0c6e39a5cf14dd167fd429a 100644 --- a/front/src/components/Classement/ClassementEquipe.js +++ b/front/src/components/Classement/ClassementEquipe.js @@ -22,7 +22,7 @@ export default function ClassEquipe() { rank: i++, association: item.name, distance: item.score, - dons: Math.trunc(item.score*eventData.argentParMetre)+" €", + //dons: Math.trunc(item.score*eventData.argentParMetre)+" €", relais: item.nbScores, rameurs: item.nbParticipant }, @@ -52,12 +52,12 @@ export default function ClassEquipe() { sort: 'disabled', width: 100, }, - { + /*{ label: 'Dons rapportés', field: 'dons', sort: 'disabled', width: 100, - }, + },*/ { label: 'Nombre de relais', field: 'relais', diff --git a/front/src/components/Classement/ClassementIndividuel.js b/front/src/components/Classement/ClassementIndividuel.js index d22640f084122e7b8883003a2972eb75bf095d70..c377209e64b1905064b7eeca3a6737c8672c57ce 100644 --- a/front/src/components/Classement/ClassementIndividuel.js +++ b/front/src/components/Classement/ClassementIndividuel.js @@ -24,7 +24,7 @@ export default function ClassIndiv() { nom: item.name, assos: item.equipes.join(", "), distance: item.score, - dons: Math.trunc(item.score*eventData.argentParMetre)+" €", + //dons: Math.trunc(item.score*eventData.argentParMetre)+" €", sessions: item.nbScores }, ), @@ -59,12 +59,12 @@ export default function ClassIndiv() { sort: 'disabled', width: 100, }, - { + /*{ label: 'Dons rapportés', field: 'dons', sort: 'disabled', width: 100, - }, + },*/ { label: 'Sessions', field: 'sessions', diff --git a/front/src/components/Classement/ClassementSprint.js b/front/src/components/Classement/ClassementSprint.js index fbacd145ec25b29808b788fd39d64ec0106e01f7..223751b405ecd266c13ac7cee3159572399d9c34 100644 --- a/front/src/components/Classement/ClassementSprint.js +++ b/front/src/components/Classement/ClassementSprint.js @@ -22,7 +22,7 @@ export default function ClassSprint() { rank: i++, association: item.name, distance: item.score, - dons: Math.trunc(item.score*eventData.argentParMetre)+" €" + //dons: Math.trunc(item.score*eventData.argentParMetre)+" €" }, ) ); @@ -50,12 +50,12 @@ export default function ClassSprint() { sort: 'disabled', width: 100, }, - { + /*{ label: 'Dons rapportés', field: 'dons', sort: 'disabled', width: 100, - }, + },*/ ], rows: data}) }