From a6ebc28d47f02babbd38782775003446cd2b1d12 Mon Sep 17 00:00:00 2001 From: julius Date: Sun, 18 May 2025 16:01:05 +0200 Subject: [PATCH] fix: gender and previous state for DEMO --- cutt/demo.py | 23 ++++++++++++----------- cutt/main.py | 6 +++--- src/Rankings.tsx | 15 +++++++++++---- 3 files changed, 26 insertions(+), 18 deletions(-) diff --git a/cutt/demo.py b/cutt/demo.py index 626d95c..4224023 100644 --- a/cutt/demo.py +++ b/cutt/demo.py @@ -2,16 +2,16 @@ import random from cutt.db import Player names = [ - "August", - "Beate", - "Ceasar", - "Daedalus", - "Elli", - "Ford P.", - "Gabriel", - "Hugo", - "Ivar Johansson", - "Jürgen Gordon Malinauskas", + ("August", "mmp"), + ("Beate", "fmp"), + ("Ceasar", "mmp"), + ("Daedalus", "mmp"), + ("Elli", "fmp"), + ("Ford P.", ""), + ("Gabriel", "mmp"), + ("Hugo", "mmp"), + ("Ivar Johansson", "mmp"), + ("Jürgen Gordon Malinauskas", "mmp"), ] demo_players = [ Player.model_validate( @@ -19,9 +19,10 @@ demo_players = [ "id": i, "display_name": name, "username": name.lower().replace(" ", "").replace(".", ""), + "gender": gender, "number": str(random.randint(0, 100)), "email": name.lower().replace(" ", "").replace(".", "") + "@example.org", } ) - for i, name in enumerate(names) + for i, (name, gender) in enumerate(names) ] diff --git a/cutt/main.py b/cutt/main.py index 1dba77e..46feb75 100644 --- a/cutt/main.py +++ b/cutt/main.py @@ -114,7 +114,7 @@ def get_mvps( return mvps else: raise HTTPException( - status_code=status.HTTP_404_NOT_FOUND, + status_code=status.HTTP_400_BAD_REQUEST, detail="no previous state was found", ) @@ -158,11 +158,11 @@ def get_chemistry( subquery, (C.user == subquery.c.user) & (C.time == subquery.c.latest) ) chemistry = session.exec(statement2).one_or_none() - if chemistry: + if chemistry is not None: return chemistry else: raise HTTPException( - status_code=status.HTTP_404_NOT_FOUND, + status_code=status.HTTP_400_BAD_REQUEST, detail="no previous state was found", ) diff --git a/src/Rankings.tsx b/src/Rankings.tsx index f42c2f5..32f0fdf 100644 --- a/src/Rankings.tsx +++ b/src/Rankings.tsx @@ -87,8 +87,12 @@ function ChemistryDnD({ user, teams, players }: PlayerInfoProps) { async function handleGet() { setLoading(true); const data = await apiAuth(`chemistry/${teams.activeTeam}`, null, "GET"); - if (data.detail) alert(data.detail); - else { + if (data.detail) { + console.log(data.detail); + setPlayersRight([]); + setPlayersMiddle(otherPlayers); + setPlayersLeft([]); + } else { const chemistry = data as Chemistry; setPlayersLeft(filterSort(otherPlayers, chemistry.hate)); setPlayersMiddle( @@ -198,8 +202,11 @@ function MVPDnD({ user, teams, players }: PlayerInfoProps) { async function handleGet() { setLoading(true); const data = await apiAuth(`mvps/${teams.activeTeam}`, null, "GET"); - if (data.detail) alert(data.detail); - else { + if (data.detail) { + console.log(data.detail); + setAvailablePlayers(players); + setRankedPlayers([]); + } else { const mvps = data as MVPRanking; setRankedPlayers(filterSort(players, mvps.mvps)); setAvailablePlayers(