reorganize directorships calculations

Author: BigSpaceships

conditional/blueprints/dashboard.py

@@ -16,7 +16,7 @@
 from conditional.util.ldap import ldap_is_active
 from conditional.util.ldap import ldap_is_intromember
 from conditional.util.ldap import ldap_is_onfloor
-from conditional.util.member import get_freshman_data, get_voting_members, get_cm, get_hm, req_cm
+from conditional.util.member import get_freshman_data, get_voting_members, get_gatekeep_passed, get_cm, get_hm, req_cm
 
 logger = structlog.get_logger()
 

conditional/util/member.py

@@ -118,11 +118,8 @@ def get_onfloor_members():
 
 
 def get_cm(member):
-    c_meetings = [{
-        "uid": cm.uid,
-        "timestamp": cm.timestamp,
-        "committee": cm.committee
-    } for cm in CommitteeMeeting.query.join(
+
+    query_result = CommitteeMeeting.query.join(
         MemberCommitteeAttendance,
         MemberCommitteeAttendance.meeting_id == CommitteeMeeting.id
         ).with_entities(
@@ -133,7 +130,14 @@ def get_cm(member):
                 CommitteeMeeting.timestamp > start_of_year(),
                 MemberCommitteeAttendance.uid == member.uid,
                 CommitteeMeeting.approved == True # pylint: disable=singleton-comparison
-                ).all()]
+                ).all()
+
+    c_meetings = [{
+        "uid": cm.uid,
+        "timestamp": cm.timestamp,
+        "committee": cm.committee
+    } for cm in query_result]
+
     return c_meetings