From 451c16318546ebce49088ec1882c2bd8af19c000 Mon Sep 17 00:00:00 2001
From: Thomas Bouquet <thomas.bouquet@student-cs.fr>
Date: Sat, 6 Mar 2021 13:18:22 +0100
Subject: [PATCH] =?UTF-8?q?avec=20SELECT=20=C3=A7a=20marche=20mieux=20duh?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
back/src/controllers/equipe.controller.js | 2 +-
front/src/components/Classement.js | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/back/src/controllers/equipe.controller.js b/back/src/controllers/equipe.controller.js
index b4fc9067..881a69d0 100644
--- a/back/src/controllers/equipe.controller.js
+++ b/back/src/controllers/equipe.controller.js
@@ -52,7 +52,7 @@ function getClassementEquipe(req, res) {
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;"
+ var query = "SELECT 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) {
diff --git a/front/src/components/Classement.js b/front/src/components/Classement.js
index 0f28af7e..d952c2aa 100644
--- a/front/src/components/Classement.js
+++ b/front/src/components/Classement.js
@@ -40,11 +40,11 @@ class Classement extends Component {
<MDBIcon icon="users" className="mr-1" /> Associations
</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>*/}
+ </MDBNavItem>
</MDBNav>
<MDBTabContent activeItem={this.state.items["default"]}>
<MDBTabPane tabId="1">
@@ -53,9 +53,9 @@ class Classement extends Component {
<MDBTabPane tabId="2">
<ClassEquipe />
</MDBTabPane>
- {/*<MDBTabPane tabId="3">
+ <MDBTabPane tabId="3">
<ClassSprint />
- </MDBTabPane>*/}
+ </MDBTabPane>
</MDBTabContent>
</MDBCol>
</MDBRow>
--
GitLab