Skip to content

Automatically add 2 housing points when user passes spring evals #511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pikachu0542 wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Automatically add 2 housing points when user passes spring evals #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a5b709
Automatically add 2 housing points when user passes spring evals
pikachu0542 Mar 16, 2026
b78a952
Housing points properly added on passed spring evals conditional
pikachu0542 Mar 16, 2026
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ target/
# Cloud9 IDE
/.c9

# VS Codepy
.vscode/

# Sensitive project files
/config.json
/config.py
Expand Down
9 changes: 9 additions & 0 deletions conditional/blueprints/conditional.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
Expand Down Expand Up @@ -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(
{
Expand All @@ -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(
{
Expand Down
5 changes: 4 additions & 1 deletion conditional/blueprints/slideshow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down
Loading