Skip to content

Commit b78a952

Browse files
committed
Housing points properly added on passed spring evals conditional
1 parent 4a5b709 commit b78a952

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-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: 9 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__)
@@ -88,9 +89,11 @@ def conditional_review(user_dict=None):
8889
cid = post_data['id']
8990
status = post_data['status']
9091

92+
print(post_data)
9193
log.info(f'Updated conditional-{cid} to {status}')
9294
conditional = Conditional.query.filter(Conditional.id == cid)
9395
cond_obj = conditional.first()
96+
uid = cond_obj.uid
9497

9598
conditional.update(
9699
{
@@ -101,6 +104,12 @@ def conditional_review(user_dict=None):
101104
{
102105
'status': status
103106
})
107+
108+
if status == 'Passed':
109+
account = ldap_get_member(uid)
110+
hp = account.housingPoints
111+
ldap_set_housingpoints(account, hp + 2)
112+
104113
elif cond_obj.i_evaluation:
105114
FreshmanEvalData.query.filter(FreshmanEvalData.id == cond_obj.i_evaluation).update(
106115
{

conditional/blueprints/slideshow.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ 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-
140+
141141
hp = account.housingPoints
142142
ldap_set_housingpoints(account, hp + 2)
143143
elif status == "Failed":

0 commit comments

Comments
 (0)