Liste asso / participant

back/src/controllers/equipe.controller.js

@@ -41,6 +41,20 @@ function getEquipes(req, res){
   con.end();
 }
 
+function getEquipesByUserId(req, res){
+  var con = mysql.createConnection(dbConfig);
+  var query = "SELECT Equi.name AS asso FROM Score LEFT JOIN (SELECT * FROM Participant WHERE deleted = 0) AS Part ON Part.id=Score.ParticipantId LEFT JOIN (SELECT * FROM Equipe WHERE deleted = 0) AS Equi ON Score.equipeId=Equi.id WHERE Score.deleted = 0 AND Part.id = "+req.body.id+" ORDER BY asso ASC;"
+  con.connect();
+  con.query(query, (err, result) => {
+  if(err){
+      console.log(err)
+      return res.send({success: false})
+  }
+  return res.send(result)
+  });
+  con.end();
+}
+
 function addNewEquipe(req, res){
   var con = mysql.createConnection(dbConfig);
   var query = "INSERT INTO `Equipe` (`name`) VALUES ('"+req.body.name+"');"
@@ -84,4 +98,4 @@ function deleteEquipe(req, res){
 }
 
 
-module.exports = {getClassementEquipe,getEquipes,addNewEquipe,updateEquipe,deleteEquipe}
+module.exports = {getClassementEquipe,getEquipes,addNewEquipe,updateEquipe,deleteEquipe,getEquipesByUserId}

back/src/routes/api.js

@@ -10,6 +10,7 @@ router.use(bodyParser.urlencoded({ extended: true }));
 
 router.get('/classement_par_equipes', controller.equipe.getClassementEquipe);
 router.get('/equipes', controller.equipe.getEquipes);
+router.get('/equipes_by_user_id', controller.equipe.getEquipesByUserId);
 router.get('/classement_individuel', controller.participant.getClassementIndividuel);
 router.get('/participants', controller.participant.getParticipants);
 router.get('/objectifs', controller.objectifs.getClassementObjectifs);

front_thomas/src/components/Classement/ClassementIndividuel.js

@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react';
 import axios from 'axios';
 import { MDBDataTableV5 } from 'mdbreact';
 import eventData from "../../eventData/eventData.json";
+import GetAssociations from "../ListeAssociations";
 
 export default function ClassIndiv() {
 
@@ -21,7 +22,7 @@ export default function ClassIndiv() {
       {
         rank: i++,
         nom: item.name,
-        assos: item.nbEquipes,
+        assos: GetAssociations(item.id)/*item.nbEquipes*/,
         distance: item.score,
         dons: Math.trunc(item.score*eventData.argentParMetre)+" €",
         sessions: item.nbScores

front_thomas/src/components/ListeAssociations.js

+import React, { useState, useEffect } from 'react';
+import axios from 'axios';
+
+export default function GetAssociations (props) {
+
+    var [associations,setAssociations] = useState([]);
+    useEffect(() => {
+    const interval = setInterval(() => {
+      axios.get('/api/equipes_by_user_id',props).then((response) => setAssociations(response.data));
+    }, 500);
+    return () => clearInterval(interval);
+    }, []);
+
+    var listeAssos = "";
+    associations.map((item) => {
+        listeAssos = listeAssos+item.asso+" / "
+    })
+
+    return (listeAssos)
+}
\ No newline at end of file