Merge pull request #152 from ComputerScienceHouse/develop

Conditional 1.5.1

Author: mbillow

conditional/blueprints/spring_evals.py

@@ -49,7 +49,7 @@ def display_spring_evals(internal=False):
 
         eval_data = None
 
-        h_meetings = [m.meeting_id for m in get_hm(account)]
+        h_meetings = [m.meeting_id for m in get_hm(account, only_absent=True)]
         member = {
             'name': account.cn,
             'uid': uid,

conditional/util/member.py

@@ -128,7 +128,7 @@ def get_cm(member):
     return c_meetings
 
 
-def get_hm(member):
+def get_hm(member, only_absent=False):
     h_meetings = MemberHouseMeetingAttendance.query.outerjoin(
                   HouseMeeting,
                   MemberHouseMeetingAttendance.meeting_id == HouseMeeting.id).with_entities(
@@ -137,4 +137,6 @@ def get_hm(member):
                       HouseMeeting.date).filter(
                           HouseMeeting.date > start_of_year(),
                           MemberHouseMeetingAttendance.uid == member.uid)
+    if only_absent:
+        h_meetings = h_meetings.filter(MemberHouseMeetingAttendance.attendance_status == "Absent")
     return h_meetings