Skip to content

Fix House Meeting Attendance Status Display #151

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

Merged
merged 2 commits into from
Aug 28, 2017
Merged

Fix House Meeting Attendance Status Display #151

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
4bb77f7
Fix House Meeting Attendance Status Display
liam-middlebrook Aug 28, 2017
33169aa
Use SQLAlchemy Filter
mbillow Aug 28, 2017
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
2 changes: 1 addition & 1 deletion conditional/blueprints/spring_evals.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 3 additions & 1 deletion conditional/util/member.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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