From 00f00ac55c0118e0b903d397bb92d5ae0279c0fe Mon Sep 17 00:00:00 2001 From: "Noah Hanford (spaced)" Date: Sat, 28 Feb 2026 00:46:30 -0500 Subject: [PATCH 1/4] fix intro evals dying --- conditional/blueprints/intro_evals.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/conditional/blueprints/intro_evals.py b/conditional/blueprints/intro_evals.py index e4464c3..1085fcd 100644 --- a/conditional/blueprints/intro_evals.py +++ b/conditional/blueprints/intro_evals.py @@ -82,8 +82,7 @@ def get_intro_members_without_accounts(): # freshmen who don't have accounts freshman_accounts = list(FreshmanAccount.query.filter( - FreshmanAccount.eval_date > semester_start, - FreshmanAccount.eval_date > datetime.now())) + FreshmanAccount.eval_date >= semester_start)) ie_members = [] @@ -124,6 +123,8 @@ def get_intro_members_without_accounts(): } ie_members.append(freshman) + print(ie_members) + return ie_members @intro_evals_bp.route('/intro_evals/') @@ -197,7 +198,7 @@ def display_intro_evals(internal=False, user_dict=None): uid = member.uid name = member.cn freshman_data = FreshmanEvalData.query.filter( - FreshmanEvalData.eval_date > semester_start, + FreshmanEvalData.eval_date >= semester_start, FreshmanEvalData.uid == uid).first() if freshman_data is None: From a388b70c7405e9974d1f9a9b70ad3407d20637d7 Mon Sep 17 00:00:00 2001 From: "Noah Hanford (spaced)" Date: Sat, 28 Feb 2026 00:50:45 -0500 Subject: [PATCH 2/4] fix gatekeep active calcuations --- conditional/util/member.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conditional/util/member.py b/conditional/util/member.py index f091cd4..098ba0b 100644 --- a/conditional/util/member.py +++ b/conditional/util/member.py @@ -162,9 +162,9 @@ def req_cm(uid, members_on_coop=None): def is_gatekeep_active(): - today = datetime.today() - before_evals_one = len(FreshmanAccount.query.filter(FreshmanAccount.eval_date > today).limit(1).all()) - before_evals_two = len(FreshmanEvalData.query.filter(FreshmanEvalData.eval_date > today).limit(1).all()) + today = datetime.today().date() + before_evals_one = len(FreshmanAccount.query.filter(FreshmanAccount.eval_date >= today).limit(1).all()) + before_evals_two = len(FreshmanEvalData.query.filter(FreshmanEvalData.eval_date >= today).limit(1).all()) return not (before_evals_one > 0 or before_evals_two > 0) From c43630d9c5327ee7eda66879f321e8a7b107d1b0 Mon Sep 17 00:00:00 2001 From: "Noah Hanford (spaced)" Date: Sat, 28 Feb 2026 01:09:00 -0500 Subject: [PATCH 3/4] fix spring evals 500 --- conditional/blueprints/spring_evals.py | 3 ++- conditional/util/member.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/conditional/blueprints/spring_evals.py b/conditional/blueprints/spring_evals.py index 80c9194..ad429f0 100644 --- a/conditional/blueprints/spring_evals.py +++ b/conditional/blueprints/spring_evals.py @@ -112,13 +112,14 @@ def display_spring_evals(internal=False, user_dict=None): member_major_projects = major_projects.get(uid, []) passed_mps = [project for project in member_major_projects if project['status'] == 'Passed'] + cms = req_cm(uid, coop_members) member = { 'name': name, 'uid': uid, 'status': spring_entry.status, 'committee_meetings': cm_attended_count, - 'req_meetings': req_cm(uid, coop_members), + 'req_meetings': cms, 'house_meetings_missed': member_missed_hms, 'major_projects': member_major_projects } diff --git a/conditional/util/member.py b/conditional/util/member.py index 098ba0b..0c171a3 100644 --- a/conditional/util/member.py +++ b/conditional/util/member.py @@ -143,11 +143,12 @@ def get_hm(member, only_absent=False): return h_meetings -@service_cache(maxsize=128) +# @service_cache(maxsize=128) # Can't hash because members_on_coop is a list def req_cm(uid, members_on_coop=None): # Get the number of required committee meetings based on if the member # is going on co-op in the current operating session. on_coop = False + if members_on_coop: on_coop = uid in members_on_coop else: From 12ee144f69224bcce29ca623b014f596ba3bc7c4 Mon Sep 17 00:00:00 2001 From: "Noah Hanford (spaced)" Date: Sat, 28 Feb 2026 01:16:26 -0500 Subject: [PATCH 4/4] made lint happy --- conditional/blueprints/intro_evals.py | 2 -- conditional/blueprints/spring_evals.py | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/conditional/blueprints/intro_evals.py b/conditional/blueprints/intro_evals.py index 1085fcd..262ae18 100644 --- a/conditional/blueprints/intro_evals.py +++ b/conditional/blueprints/intro_evals.py @@ -1,5 +1,3 @@ -from datetime import datetime - import structlog from flask import Blueprint, request from sqlalchemy import func diff --git a/conditional/blueprints/spring_evals.py b/conditional/blueprints/spring_evals.py index ad429f0..80c9194 100644 --- a/conditional/blueprints/spring_evals.py +++ b/conditional/blueprints/spring_evals.py @@ -112,14 +112,13 @@ def display_spring_evals(internal=False, user_dict=None): member_major_projects = major_projects.get(uid, []) passed_mps = [project for project in member_major_projects if project['status'] == 'Passed'] - cms = req_cm(uid, coop_members) member = { 'name': name, 'uid': uid, 'status': spring_entry.status, 'committee_meetings': cm_attended_count, - 'req_meetings': cms, + 'req_meetings': req_cm(uid, coop_members), 'house_meetings_missed': member_missed_hms, 'major_projects': member_major_projects }