From 4a5b709af179e9ff5004a484fa08e7bea54ecc8b Mon Sep 17 00:00:00 2001 From: pikachu0542 Date: Mon, 16 Mar 2026 12:42:13 -0400 Subject: [PATCH 1/2] Automatically add 2 housing points when user passes spring evals --- conditional/blueprints/slideshow.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/conditional/blueprints/slideshow.py b/conditional/blueprints/slideshow.py index ec290657..3f9cbb0e 100644 --- a/conditional/blueprints/slideshow.py +++ b/conditional/blueprints/slideshow.py @@ -11,7 +11,7 @@ from conditional.models.models import SpringEval from conditional.util.auth import get_user from conditional.util.flask import render_template -from conditional.util.ldap import ldap_is_intromember, ldap_set_failed, ldap_set_bad_standing, \ +from conditional.util.ldap import ldap_is_intromember, ldap_set_failed, ldap_set_bad_standing, ldap_set_housingpoints, \ ldap_set_inactive, ldap_get_member, ldap_set_not_intro_member from conditional.util.user_dict import user_dict_is_eval_director @@ -137,6 +137,9 @@ def slideshow_spring_review(user_dict=None): if status == "Passed": if ldap_is_intromember(account): ldap_set_not_intro_member(account) + + hp = account.housingPoints + ldap_set_housingpoints(account, hp + 2) elif status == "Failed": if ldap_is_intromember(account): ldap_set_failed(account) From b78a952a2c1d56bf748269355fe5af10f319d4ac Mon Sep 17 00:00:00 2001 From: pikachu0542 Date: Mon, 16 Mar 2026 15:31:50 -0400 Subject: [PATCH 2/2] Housing points properly added on passed spring evals conditional --- .gitignore | 3 +++ conditional/blueprints/conditional.py | 9 +++++++++ conditional/blueprints/slideshow.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 11c2a4c7..791dee1b 100644 --- a/.gitignore +++ b/.gitignore @@ -69,6 +69,9 @@ target/ # Cloud9 IDE /.c9 +# VS Codepy +.vscode/ + # Sensitive project files /config.json /config.py diff --git a/conditional/blueprints/conditional.py b/conditional/blueprints/conditional.py index 74a4913f..e36be30a 100644 --- a/conditional/blueprints/conditional.py +++ b/conditional/blueprints/conditional.py @@ -7,6 +7,7 @@ from conditional.models.models import Conditional, SpringEval, FreshmanEvalData from conditional.util.auth import get_user from conditional.util.flask import render_template +from conditional.util.ldap import ldap_get_member, ldap_set_housingpoints from conditional.util.user_dict import user_dict_is_eval_director conditionals_bp = Blueprint('conditionals_bp', __name__) @@ -88,9 +89,11 @@ def conditional_review(user_dict=None): cid = post_data['id'] status = post_data['status'] + print(post_data) log.info(f'Updated conditional-{cid} to {status}') conditional = Conditional.query.filter(Conditional.id == cid) cond_obj = conditional.first() + uid = cond_obj.uid conditional.update( { @@ -101,6 +104,12 @@ def conditional_review(user_dict=None): { 'status': status }) + + if status == 'Passed': + account = ldap_get_member(uid) + hp = account.housingPoints + ldap_set_housingpoints(account, hp + 2) + elif cond_obj.i_evaluation: FreshmanEvalData.query.filter(FreshmanEvalData.id == cond_obj.i_evaluation).update( { diff --git a/conditional/blueprints/slideshow.py b/conditional/blueprints/slideshow.py index 3f9cbb0e..7aa3ba0e 100644 --- a/conditional/blueprints/slideshow.py +++ b/conditional/blueprints/slideshow.py @@ -137,7 +137,7 @@ def slideshow_spring_review(user_dict=None): if status == "Passed": if ldap_is_intromember(account): ldap_set_not_intro_member(account) - + hp = account.housingPoints ldap_set_housingpoints(account, hp + 2) elif status == "Failed":