From 49248a4bfad580e89b2c4b8bad9e6fd9341d736b Mon Sep 17 00:00:00 2001
From: memeriau <manuel.emeriau@mappy.com>
Date: Sat, 16 Apr 2022 18:47:43 +0200
Subject: [PATCH] show selected team for each candidates

---
 .../TeamAssignment/TeamWithCandidates.tsx     | 54 ++++++++++---------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/components/TeamAssignment/TeamWithCandidates.tsx b/src/components/TeamAssignment/TeamWithCandidates.tsx
index 1820125..daed180 100644
--- a/src/components/TeamAssignment/TeamWithCandidates.tsx
+++ b/src/components/TeamAssignment/TeamWithCandidates.tsx
@@ -54,7 +54,7 @@ type Props = {
 
 const TeamWithCandidates: FC<Props> = ({ teamId }): JSX.Element | null => {
     const teams = useSelector(selectTeamsWithVolunteersCandidates)
-    const team = teams.find((t) => t.id === teamId)
+    const currentTeam = teams.find((t) => t.id === teamId)
     const [, saveTeam] = useTeamAssign()
 
     const onTeamSelected = useCallback(
@@ -64,37 +64,39 @@ const TeamWithCandidates: FC<Props> = ({ teamId }): JSX.Element | null => {
         [saveTeam]
     )
 
-    if (!team) return null
+    if (!currentTeam) return null
 
     return (
         <div>
             <div>
-                Equipe {team.name} ({team.volunteers.length}) :
+                Equipe {currentTeam.name} ({currentTeam.volunteers.length}) :
             </div>
             <ul>
-                {team.volunteers.map(({ id, lastname, firstname, teamWishes, dayWishes }) => (
-                    <li key={id}>
-                        <span className={styles.volunteerName}>
-                            {firstname} {lastname} (<DaysDisplay dayWishes={dayWishes} />)
-                        </span>
-                        {teamWishes.map((teamWish) => {
-                            const active = false
-                            return (
-                                <button
-                                    key={teamWish.id}
-                                    type="button"
-                                    onClick={() => onTeamSelected(id, teamWish.id)}
-                                    className={classnames(
-                                        styles.teamWishButton,
-                                        active && styles.teamActive
-                                    )}
-                                >
-                                    {teamWish.name}
-                                </button>
-                            )
-                        })}
-                    </li>
-                ))}
+                {currentTeam.volunteers.map(
+                    ({ id, lastname, firstname, teamWishes, dayWishes, team }) => (
+                        <li key={id}>
+                            <span className={styles.volunteerName}>
+                                {firstname} {lastname} (<DaysDisplay dayWishes={dayWishes} />)
+                            </span>
+                            {teamWishes.map((teamWish) => {
+                                const active = teamWish.id === team
+                                return (
+                                    <button
+                                        key={teamWish.id}
+                                        type="button"
+                                        onClick={() => onTeamSelected(id, teamWish.id)}
+                                        className={classnames(
+                                            styles.teamWishButton,
+                                            active && styles.teamActive
+                                        )}
+                                    >
+                                        {teamWish.name}
+                                    </button>
+                                )
+                            })}
+                        </li>
+                    )
+                )}
             </ul>
         </div>
     )