Skip to content

Commit 9ece135

Browse files
committed
Fix Membership Eval Display
1 parent 3e34482 commit 9ece135

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

conditional/blueprints/dashboard.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
from conditional.models.models import MajorProject
1515
from conditional.models.models import Conditional
1616
from conditional.models.models import HouseMeeting
17+
from conditional.models.models import SpringEval
1718
from conditional.models.models import CommitteeMeeting
1819

1920
from conditional.util.housing import get_queue_position
@@ -63,6 +64,8 @@ def display_dashboard():
6364
MemberHouseMeetingAttendance.query.filter(
6465
MemberHouseMeetingAttendance.uid == member.uid)]
6566
spring['hm_missed'] = len([h for h in h_meetings if h[1] == "Absent"])
67+
spring['status'] = SpringEval.query.filter(SpringEval.uid == member.uid
68+
and SpringEval.active).first().status
6669

6770
data['spring'] = spring
6871

conditional/blueprints/spring_evals.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import uuid
22
import structlog
3+
import datetime
34

45
from flask import Blueprint, request
56

@@ -44,7 +45,10 @@ def get_cm_count(member_id):
4445
SpringEval.active).first()
4546

4647
if spring_entry is None:
47-
spring_entry = SpringEval(uid)
48+
spring_entry = SpringEval(uid=uid,
49+
active=True,
50+
date_created=datetime.datetime.now(),
51+
status="Pending")
4852
db.session.add(spring_entry)
4953
db.session.flush()
5054
db.session.commit()

0 commit comments

Comments
 (0)