From fd95c3fbf9e7223b497a0fa930dd790c176034f8 Mon Sep 17 00:00:00 2001 From: Ari Anisfeld Date: Mon, 11 Mar 2024 17:13:56 -0400 Subject: [PATCH 1/3] fix blank space bug --- prijateli_tree/app/templates/administration/create_session.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prijateli_tree/app/templates/administration/create_session.html b/prijateli_tree/app/templates/administration/create_session.html index bbe198b3..60890928 100644 --- a/prijateli_tree/app/templates/administration/create_session.html +++ b/prijateli_tree/app/templates/administration/create_session.html @@ -41,7 +41,7 @@ formData.append("player_" + numbers[i], parseInt(selectedRows[i][0])) lang = selectedRows[i][1] languageCounter[lang] = languageCounter[lang] ? languageCounter[lang] + 1 : 1; - groups = selectedRows[i][2].split('\n').map(s => s.trim()); + groups = selectedRows[i][2].split(' ').map(s => s.trim()); for (const g of groups) { if (g) { // g can be "" groupCounter[g] = groupCounter[g] ? groupCounter[g] + 1 : 1; From 286a73deb9ec24fbf7b99721f8904cb11fd914ca Mon Sep 17 00:00:00 2001 From: Ari Anisfeld Date: Mon, 11 Mar 2024 18:08:43 -0400 Subject: [PATCH 2/3] first or none --- prijateli_tree/app/routers/games.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/prijateli_tree/app/routers/games.py b/prijateli_tree/app/routers/games.py index 5bd86736..08452989 100644 --- a/prijateli_tree/app/routers/games.py +++ b/prijateli_tree/app/routers/games.py @@ -10,6 +10,7 @@ from fastapi.responses import HTMLResponse, JSONResponse, RedirectResponse from fastapi.templating import Jinja2Templates from sqlalchemy.orm import Session +from sqlalchemy import desc from prijateli_tree.app.database import ( Game, @@ -81,8 +82,9 @@ def choose_session_players( ) -> Response: session = ( db.query(GameSession) - .filter_by(session_key=session_key.lower()) - .one_or_none() + .filter_by(session_key=session_key.lower()) + .order_by(desc('created_at')) + .first() ) if session is None: return templates.TemplateResponse( From 48785f4b97a91e8ed8b863f1b02141107dc6d9d1 Mon Sep 17 00:00:00 2001 From: Ari Anisfeld Date: Mon, 11 Mar 2024 18:14:41 -0400 Subject: [PATCH 3/3] lint --- prijateli_tree/app/routers/games.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/prijateli_tree/app/routers/games.py b/prijateli_tree/app/routers/games.py index 08452989..e26c2340 100644 --- a/prijateli_tree/app/routers/games.py +++ b/prijateli_tree/app/routers/games.py @@ -9,8 +9,8 @@ from fastapi import APIRouter, Depends, Form, HTTPException, Request, Response from fastapi.responses import HTMLResponse, JSONResponse, RedirectResponse from fastapi.templating import Jinja2Templates -from sqlalchemy.orm import Session from sqlalchemy import desc +from sqlalchemy.orm import Session from prijateli_tree.app.database import ( Game, @@ -82,8 +82,8 @@ def choose_session_players( ) -> Response: session = ( db.query(GameSession) - .filter_by(session_key=session_key.lower()) - .order_by(desc('created_at')) + .filter_by(session_key=session_key.lower()) + .order_by(desc("created_at")) .first() ) if session is None: