Skip to content

Commit 47d5bfe

Browse files
Automatically add 2 housing points when user passes spring evals (#511)
* Automatically add 2 housing points when user passes spring evals * Housing points properly added on passed spring evals conditional * Fixed thing --------- Co-authored-by: Noah Hanford <spaced@csh.rit.edu>
1 parent 6441972 commit 47d5bfe

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ target/
6969
# Cloud9 IDE
7070
/.c9
7171

72+
# VS Codepy
73+
.vscode/
74+
7275
# Sensitive project files
7376
/config.json
7477
/config.py

conditional/blueprints/conditional.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from conditional.models.models import Conditional, SpringEval, FreshmanEvalData
88
from conditional.util.auth import get_user
99
from conditional.util.flask import render_template
10+
from conditional.util.ldap import ldap_get_member, ldap_set_housingpoints
1011
from conditional.util.user_dict import user_dict_is_eval_director
1112

1213
conditionals_bp = Blueprint('conditionals_bp', __name__)
@@ -91,6 +92,7 @@ def conditional_review(user_dict=None):
9192
log.info(f'Updated conditional-{cid} to {status}')
9293
conditional = Conditional.query.filter(Conditional.id == cid)
9394
cond_obj = conditional.first()
95+
uid = cond_obj.uid
9496

9597
conditional.update(
9698
{
@@ -101,6 +103,12 @@ def conditional_review(user_dict=None):
101103
{
102104
'status': status
103105
})
106+
107+
if status == 'Passed':
108+
account = ldap_get_member(uid)
109+
hp = account.housingPoints
110+
ldap_set_housingpoints(account, hp + 2)
111+
104112
elif cond_obj.i_evaluation:
105113
FreshmanEvalData.query.filter(FreshmanEvalData.id == cond_obj.i_evaluation).update(
106114
{

conditional/blueprints/slideshow.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from conditional.models.models import SpringEval
1212
from conditional.util.auth import get_user
1313
from conditional.util.flask import render_template
14-
from conditional.util.ldap import ldap_is_intromember, ldap_set_failed, ldap_set_bad_standing, \
14+
from conditional.util.ldap import ldap_is_intromember, ldap_set_failed, ldap_set_bad_standing, ldap_set_housingpoints, \
1515
ldap_set_inactive, ldap_get_member, ldap_set_not_intro_member
1616
from conditional.util.user_dict import user_dict_is_eval_director
1717

@@ -137,6 +137,9 @@ def slideshow_spring_review(user_dict=None):
137137
if status == "Passed":
138138
if ldap_is_intromember(account):
139139
ldap_set_not_intro_member(account)
140+
141+
hp = account.housingPoints
142+
ldap_set_housingpoints(account, hp + 2)
140143
elif status == "Failed":
141144
if ldap_is_intromember(account):
142145
ldap_set_failed(account)

0 commit comments

Comments
 (0)