Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions db_init.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
db.session.add(row)
db.session.commit()

class_years_rows = (2024, 2025, 2026, 2027, 2028, 2029, 2030, 2031)
class_years_rows = (2025, 2026, 2027, 2028, 2029, 2030, 2031)

for row_item in class_years_rows:
row = ClassYears(class_year=row_item, active=True)
Expand Down Expand Up @@ -182,7 +182,7 @@
False,
True,
SemesterEnum.SPRING,
2024,
2025,
date.today(),
True,
datetime.now(),
Expand All @@ -198,7 +198,7 @@
True,
True,
SemesterEnum.SPRING,
2024,
2025,
date.today(),
True,
datetime.now(),
Expand All @@ -214,7 +214,7 @@
True,
True,
SemesterEnum.FALL,
2024,
2025,
date.today(),
True,
datetime.now(),
Expand All @@ -230,7 +230,7 @@
True,
True,
SemesterEnum.SUMMER,
2024,
2025,
date.today(),
True,
datetime.now(),
Expand All @@ -246,10 +246,10 @@
True,
False,
SemesterEnum.FALL,
2024,
"2024-10-31",
2025,
"2025-10-31",
True,
"2024-10-10T10:30:00",
"2025-10-10T10:30:00",
LocationEnum.JROWL,
),
)
Expand Down Expand Up @@ -331,7 +331,7 @@
db.session.add(row)
db.session.commit()

recommends_class_years_rows = ((2, 2024), (2, 2025), (2, 2026), (1, 2027))
recommends_class_years_rows = ((3, 2025), (2, 2025), (2, 2026), (1, 2027))

for r in recommends_class_years_rows:
row = RecommendsClassYears(opportunity_id=r[0], class_year=r[1])
Expand Down
Binary file modified docs/database_docs/Labconnect_DB.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions labconnect/main/auth_routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ def validate_code_and_get_user_email(code: str) -> str | None:
def saml_login():

# In testing skip RPI login purely for local development
if (
current_app.config["TESTING"]
and current_app.config["FRONTEND_URL"] == "http://localhost:3000"
if current_app.config["TESTING"] and (
current_app.config["FRONTEND_URL"] == "http://localhost:3000"
or current_app.config["FRONTEND_URL"] == "http://127.0.0.1:3000"
):
# Generate JWT
code = generate_temporary_code("[email protected]")
Expand Down
Loading
Loading