Miscellaneous fixes

Author: mbillow

conditional/blueprints/intro_evals.py

@@ -35,12 +35,12 @@ def display_intro_evals(internal=False):
     def get_uid_cm_count(member_id):
         return len([a for a in MemberCommitteeAttendance.query.filter(
             MemberCommitteeAttendance.uid == member_id)
-            if CommitteeMeeting.query.filter(CommitteeMeeting.id == a.meeting_id).approved])
+            if CommitteeMeeting.query.filter(CommitteeMeeting.id == a.meeting_id).first().approved])
 
     def get_fid_cm_count(member_id):
         return len([a for a in FreshmanCommitteeAttendance.query.filter(
             FreshmanCommitteeAttendance.fid == member_id)
-            if CommitteeMeeting.query.filter(CommitteeMeeting.id == a.meeting_id).approved])
+            if CommitteeMeeting.query.filter(CommitteeMeeting.id == a.meeting_id).first().approved])
 
     user_name = None
     if not internal:
@@ -92,7 +92,7 @@ def get_fid_cm_count(member_id):
                     TechnicalSeminar.id.in_(
                         [a.seminar_id for a in FreshmanSeminarAttendance.query.filter(
                             FreshmanSeminarAttendance.fid == fid.id)
-                            if TechnicalSeminar.query.filter(TechnicalSeminar.id == a.seminar_id).approved]
+                            if TechnicalSeminar.query.filter(TechnicalSeminar.id == a.seminar_id).first().approved]
                     ))
                  ],
             'social_events': '',
@@ -146,7 +146,7 @@ def get_fid_cm_count(member_id):
                     TechnicalSeminar.id.in_(
                         [a.seminar_id for a in MemberSeminarAttendance.query.filter(
                             MemberSeminarAttendance.uid == uid)
-                            if TechnicalSeminar.query.filter(TechnicalSeminar.id == a.seminar_id).approved]
+                            if TechnicalSeminar.query.filter(TechnicalSeminar.id == a.seminar_id).first().approved]
                     ))
                  ],
             'social_events': freshman_data.social_events,

conditional/blueprints/spring_evals.py

@@ -30,7 +30,7 @@ def display_spring_evals(internal=False):
     def get_cm_count(member_id):
         return len([a for a in MemberCommitteeAttendance.query.filter(
             MemberCommitteeAttendance.uid == member_id)
-            if CommitteeMeeting.query.filter(CommitteeMeeting.id == a.meeting_id).approved])
+            if CommitteeMeeting.query.filter(CommitteeMeeting.id == a.meeting_id).first().approved])
 
     user_name = None
     if not internal:
@@ -89,7 +89,7 @@ def get_cm_count(member_id):
                     MajorProject.uid == uid)]
         }
         member['major_projects_len'] = len(member['major_projects'])
-        member['major_project_passed'] = [
+        member['major_projects_passed'] = [
             {
                 'name': p.name,
                 'status': p.status,

conditional/templates/spring_eval_slideshow.html

@@ -32,8 +32,8 @@ <h3>{{m['house_meetings_missed']|length}}</h3>
           </div>
           <div class="col-xs-12 col-md-4">
             {% set major_projects_passed = m['major_projects_passed_len'] >= 1 %}
-            <div class="item{% if major_projects_passed_len %} passed{% endif %}">
-              <span class="icon glyphicon glyphicon-{% if major_projects_passed_len %}ok passed{%else%}remove{% endif %}" aria-hidden="true"></span>
+            <div class="item{% if major_projects_passed %} passed{% endif %}">
+              <span class="icon glyphicon glyphicon-{% if major_projects_passed %}ok passed{%else%}remove{% endif %}" aria-hidden="true"></span>
               <h3>{{m['major_projects_passed_len']}}</h3>
               <p>Major Projects</p>
             </div>

frontend/stylesheets/partials/_global.scss

@@ -1,4 +1,5 @@
-.navbar-fixed-bottom, .navbar-fixed-top {
+.navbar-fixed-bottom,
+.navbar-fixed-top {
   z-index: 900;
 }