diff --git a/back/src/controllers/equipe.controller.js b/back/src/controllers/equipe.controller.js index b4fc90675a691e8b869542be6b18e08f48bf4106..881a69d0734e1f65eddadbc1412cfced168fc62b 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 0f28af7e11979801106a5f25349f0e64e69e2807..d952c2aaedd257fc4204477dd06323052e8fb4d4 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>