From 1a4a4cb073cb9137640afb2538616a51fb01c32b Mon Sep 17 00:00:00 2001 From: Thomas Bouquet <thomas.bouquet@student-cs.fr> Date: Fri, 5 Mar 2021 14:16:12 +0100 Subject: [PATCH] test sprint via master --- .../src/controllers/participant.controller.js | 2 +- front/src/components/Login/SubmitForm.js | 20 ++++++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/back/src/controllers/participant.controller.js b/back/src/controllers/participant.controller.js index 994caf19..c0ca17fc 100644 --- a/back/src/controllers/participant.controller.js +++ b/back/src/controllers/participant.controller.js @@ -15,7 +15,7 @@ const dbConfig = { function getClassementIndividuel(req, res) { var con = mysql.createConnection(dbConfig); - var query = "SELECT Participant.id as id, Participant.name as name, score, Equipe.name AS equipe_name FROM Score JOIN Participant ON Participant.id=Score.participantId JOIN Equipe ON Score.equipeId = Equipe.id WHERE Score.deleted = 0 AND Participant.deleted=0 ORDER BY score DESC;" + var query = "SELECT Participant.id as id, Participant.name as name, score, Equipe.name AS equipe_name FROM Score JOIN Participant ON Participant.id=Score.participantId JOIN Equipe ON Score.equipeId = Equipe.id WHERE (Score.deleted = 0 AND (Participant.deleted=0 AND Participant.id <> 'sprint')) ORDER BY score DESC;" con.connect(); con.query(query, (err, result) => { if (err) { diff --git a/front/src/components/Login/SubmitForm.js b/front/src/components/Login/SubmitForm.js index 38955282..e4c15980 100644 --- a/front/src/components/Login/SubmitForm.js +++ b/front/src/components/Login/SubmitForm.js @@ -1,6 +1,7 @@ import React, { useState, useEffect } from "react"; import { MDBRow, MDBCol, MDBInput, MDBBtn, MDBCard, MDBCardBody, MDBModalFooter, MDBIcon, MDBContainer } from 'mdbreact'; import axios from 'axios'; +import eventData from "../../eventData/eventData.json"; function Submit(props) { @@ -25,17 +26,30 @@ function Submit(props) { }) }*/ + const timenow = Date.now(); + var realId; + var realName; + + if (timenow < 0/*eventData.dateFin*/) { + realId = props.participant.value; + realName = props.participant.label + } + else { + realId = 'sprint'; + realName = 'Sprint' + } + axios.post('/api/staff/new_score', { score: Math.max(0, props.score), equipe: props.equipe.value, - participant: props.participant.value + participant: realId//props.participant.value }) .then(() => { axios.post('/api/staff/new_participant_with_id', { - id: props.participant.value, - name: props.participant.label + id: realId,//props.participant.value, + name: realName//props.participant.label }) }) .then(() => { -- GitLab