Skip to content
Snippets Groups Projects
Commit ff4b1b59 authored by Thomas Bouquet's avatar Thomas Bouquet
Browse files

Ajout du classement du sprint + bonne date

parent de74ce53
Branches
No related tags found
No related merge requests found
...@@ -50,6 +50,20 @@ function getClassementEquipe(req, res) { ...@@ -50,6 +50,20 @@ function getClassementEquipe(req, res) {
con.end(); con.end();
} }
function getSprint(req, res) {
var con = mysql.createConnection(dbConfig);
var query = "Equipe.name as name,score FROM Score JOIN Equipe ON Equipe.id=Score.equipeId WHERE (Equipe.deleted = 0 AND (Score.deleted = 0 AND Score.participantId = 'sprint')) ORDER BY score DESC;"
con.connect();
con.query(query, (err, result) => {
if (err) {
console.log(err)
return res.send({ success: false })
}
return res.send(result)
});
con.end();
}
function getEquipes(req, res) { function getEquipes(req, res) {
var con = mysql.createConnection(dbConfig); var con = mysql.createConnection(dbConfig);
var query = "SELECT id,name FROM Equipe WHERE deleted = 0 ORDER BY name ASC;" var query = "SELECT id,name FROM Equipe WHERE deleted = 0 ORDER BY name ASC;"
...@@ -124,4 +138,4 @@ function deleteEquipe(req, res) { ...@@ -124,4 +138,4 @@ function deleteEquipe(req, res) {
} }
module.exports = { getClassementEquipe, getEquipes, addNewEquipe, updateEquipe, deleteEquipe, getEquipesByUserId } module.exports = { getClassementEquipe, getEquipes, addNewEquipe, updateEquipe, deleteEquipe, getEquipesByUserId, getSprint }
...@@ -20,6 +20,7 @@ router.get('/nombre_participants', controller.participant.getNombreParticipants) ...@@ -20,6 +20,7 @@ router.get('/nombre_participants', controller.participant.getNombreParticipants)
router.get('/participants_by_id', controller.participant.getParticipantsById); router.get('/participants_by_id', controller.participant.getParticipantsById);
router.get('/participants_ids', controller.participant.getParticipantsIdentifiants); router.get('/participants_ids', controller.participant.getParticipantsIdentifiants);
router.get('/my_scores', controller.participant.getResultatsPersonnels); router.get('/my_scores', controller.participant.getResultatsPersonnels);
router.get('/sprint', controller.equipe.getSprint)
router.get('/administrateurs/login', controller.administrateur.getAdminsLogins); router.get('/administrateurs/login', controller.administrateur.getAdminsLogins);
router.get('/staffeurs/login', controller.staffeurs.getStaffeursLogins); router.get('/staffeurs/login', controller.staffeurs.getStaffeursLogins);
......
...@@ -2,6 +2,7 @@ import React, { Component } from "react"; ...@@ -2,6 +2,7 @@ import React, { Component } from "react";
import { MDBContainer, MDBRow, MDBCol, MDBTabPane, MDBTabContent, MDBNav, MDBNavItem, MDBNavLink, MDBIcon } from "mdbreact"; import { MDBContainer, MDBRow, MDBCol, MDBTabPane, MDBTabContent, MDBNav, MDBNavItem, MDBNavLink, MDBIcon } from "mdbreact";
import ClassIndiv from './Classement/ClassementIndividuel'; import ClassIndiv from './Classement/ClassementIndividuel';
import ClassEquipe from './Classement/ClassementEquipe'; import ClassEquipe from './Classement/ClassementEquipe';
import ClassSprint from './Classement/ClassementSprint';
class Classement extends Component { class Classement extends Component {
state = { state = {
...@@ -38,6 +39,11 @@ class Classement extends Component { ...@@ -38,6 +39,11 @@ class Classement extends Component {
<MDBIcon icon="users" className="mr-1" /> Associations <MDBIcon icon="users" className="mr-1" /> Associations
</MDBNavLink> </MDBNavLink>
</MDBNavItem> </MDBNavItem>
<MDBNavItem>
<MDBNavLink link to="#" active={this.state.items["default"] === "3"} onClick={this.togglePills("default", "3")} >
<MDBIcon icon="running" className="mr-1" /> Sprint
</MDBNavLink>
</MDBNavItem>
</MDBNav> </MDBNav>
<MDBTabContent activeItem={this.state.items["default"]}> <MDBTabContent activeItem={this.state.items["default"]}>
<MDBTabPane tabId="1"> <MDBTabPane tabId="1">
...@@ -46,6 +52,9 @@ class Classement extends Component { ...@@ -46,6 +52,9 @@ class Classement extends Component {
<MDBTabPane tabId="2"> <MDBTabPane tabId="2">
<ClassEquipe /> <ClassEquipe />
</MDBTabPane> </MDBTabPane>
<MDBTabPane tabId="2">
<ClassSprint />
</MDBTabPane>
</MDBTabContent> </MDBTabContent>
</MDBCol> </MDBCol>
</MDBRow> </MDBRow>
......
import React, { useState, useEffect } from 'react';
import axios from 'axios';
import { MDBDataTableV5 } from 'mdbreact';
import eventData from "../../eventData/eventData.json";
export default function ClassEquipe() {
var data = [];
var [participants,setParticipants] = useState([]);
useEffect(() => {
const interval = setInterval(() => {
axios.get('/api/sprint').then((response) => setParticipants(response.data));
}, 500);
return () => clearInterval(interval);
}, []);
function RefreshData() {
var i = 1;
participants.map((item) =>
data.push(
{
rank: i++,
association: item.name,
distance: item.score,
dons: Math.trunc(item.score*eventData.argentParMetre)+""
},
)
);
return({
columns: [
{
label: '# Rang',
field: 'rank',
sort: 'disabled',
width: 100,
},
{
label: 'Association',
field: 'association',
width: 150,
sort: 'disabled',
attributes: {
'aria-controls': 'DataTable',
'aria-label': 'Association',
},
},
{
label: 'Distance (m)',
field: 'distance',
sort: 'disabled',
width: 100,
},
{
label: 'Dons rapportés',
field: 'dons',
sort: 'disabled',
width: 100,
},
],
rows: data})
}
return <MDBDataTableV5 paging={false} hover striped info={false} data={RefreshData()} searchLabel="Rechercher" responsiveLg />;
}
\ No newline at end of file
...@@ -22,7 +22,7 @@ const BasicTable = () => { ...@@ -22,7 +22,7 @@ const BasicTable = () => {
<tr> <tr>
<th>#</th> <th>#</th>
<th>Association</th> <th>Association</th>
<th>Distance</th> <th>Distance (m)</th>
<th>Participants</th> <th>Participants</th>
</tr> </tr>
</MDBTableHead> </MDBTableHead>
......
...@@ -22,7 +22,7 @@ const BasicTable = () => { ...@@ -22,7 +22,7 @@ const BasicTable = () => {
<th>#</th> <th>#</th>
<th>Rameuse/Rameur</th> <th>Rameuse/Rameur</th>
<th>Association(s)</th> <th>Association(s)</th>
<th>Distance</th> <th>Distance (m)</th>
</tr> </tr>
</MDBTableHead> </MDBTableHead>
<MDBTableBody> <MDBTableBody>
......
...@@ -9,7 +9,7 @@ function Submit(props) { ...@@ -9,7 +9,7 @@ function Submit(props) {
var realId; var realId;
var realName; var realName;
if (timenow < 0/*eventData.dateFin*/) { if (timenow <= eventData.dateFin) {
realId = props.participant.value; realId = props.participant.value;
realName = props.participant.label realName = props.participant.label
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment