From 0b7b2c3d29381638848b0e2f5e3667f795a3b212 Mon Sep 17 00:00:00 2001 From: Allan Cueff Date: Mon, 6 Nov 2023 23:33:15 +0100 Subject: [PATCH] =?UTF-8?q?fix=20page=20teams=20bit=C3=A9e=20par=20un=20me?= =?UTF-8?q?rge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Front/js/backend/team.js | 81 ++++++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 36 deletions(-) diff --git a/Front/js/backend/team.js b/Front/js/backend/team.js index 29c564b..ddbf982 100644 --- a/Front/js/backend/team.js +++ b/Front/js/backend/team.js @@ -5,7 +5,6 @@ const EquipeList = await pb.collection('equipes').getFullList({ expand: 'promo,sport,membres,capitaine', }); - const PromoList = await pb.collection('promo').getFullList({ }); @@ -14,28 +13,52 @@ const matchList = await pb.collection('match').getFullList({ expand: 'team1,team2,sport', }); -function findClassementInClassementList(classementList, equipe){ - if(classementList.length != 0){ - classementList.forEach(classe => { - if (classe.expand.team.name === equipe.name) { - return classe.classement; +function getTeamClassementBadge(equipe){ + if(equipe.classement != 0){ + return `${equipe.classement}/${numOfTeamsBySport[equipe.expand.sport.name]}` + } else if(equipe.stade != ""){ + let stade = "" + switch(equipe.stade){ + case "16": + stade = "16èmes" + break; + case "8": + stade = "8èmes" + break; + case "4": + stade = "Quarts" + break; + case "2": + stade = "Demies" + break; + case "1": + stade = "Finale" + break; } - }); + let color = "" + if(equipe.eliminated){ + color = "bg-danger" + } else { + color = "bg-primary" + } + return `${stade}` } - return 0; } -function getTeamRow(equipe){ +function getTeamsRow(sport, teams){ let result = ` -
  • -
    -
    ${equipe.expand.sport.name}
    - ${equipe.name} -
    ` - if(equipe.classement != 0){ - result += `${equipe.classement}/${numOfTeamsBySport[equipe.expand.sport.name]}` - } - result += `
  • ` +
  • +
    +
    ${sport[0].toUpperCase()}${sport.slice(1)}
    ` + teams.forEach(equipe => { + result += `
    ${equipe.name}` + if(equipe.classement !== 0 || equipe.stade !== ""){ + result += getTeamClassementBadge(equipe) + } + result += `
    ` + }) + result += `
    +
  • ` return result } @@ -46,11 +69,7 @@ function getPromoCard(promo, teamsBySport){ ` const nextMatch = matchList.find(match => match.expand.team1.promo === promo.id || match.expand.team2.promo === promo.id); @@ -78,7 +97,7 @@ function getSportRow(equipe){ let result = `
  • -
    ${equipe.expand.sport.name}
    +
    ${equipe.expand.sport.name[0].toUpperCase()}${equipe.expand.sport.name.slice(1)}
    Membres : ${members}
    ` if(equipe.classement != 0){ @@ -129,20 +148,10 @@ EquipeList.forEach(equipe => { } teamSports[equipe.name][equipe.expand.sport.name] = equipe; } -}) - -DuoBadList.forEach(duo => { - if(!(duo.expand.promo.name in promoTeamsbySport)){ - promoTeamsbySport[duo.expand.promo.name] = {}; - } - if(!("badminton" in promoTeamsbySport[duo.expand.promo.name])){ - promoTeamsbySport[duo.expand.promo.name]["badminton"] = []; - } - teamSports[equipe.name][equipe.expand.sport.name] = equipe; if(!(equipe.expand.sport.name in numOfTeamsBySport)){ - numOfTeamsBySport[equipe.expand.sport.name] = 0 + numOfTeamsBySport[equipe.expand.sport.name] = 0; } - numOfTeamsBySport[equipe.expand.sport.name] += 1 + numOfTeamsBySport[equipe.expand.sport.name] += 1; }) //Affichage des équipes par promo