Fix MP listing in Membership Eval Slideshow

Author: liam-middlebrook

conditional/blueprints/spring_evals.py

@@ -89,6 +89,14 @@ def get_cm_count(member_id):
                     MajorProject.uid == uid)]
         }
         member['major_projects_len'] = len(member['major_projects'])
+        member['major_project_passed'] = [
+            {
+                'name': p.name,
+                'status': p.status,
+                'description': p.description
+            } for p in MajorProject.query.filter(MajorProject.uid == uid)
+            if p.status == "Passed"]
+        member['major_projects_passed_len'] = len(member['major_projects_passed'])
         member['major_project_passed'] = False
         for mp in member['major_projects']:
             if mp['status'] == "Passed":

conditional/templates/spring_eval_slideshow.html

@@ -31,17 +31,17 @@ <h3>{{m['house_meetings_missed']|length}}</h3>
             </div>
           </div>
           <div class="col-xs-12 col-md-4">
-            {% set major_projects_passed = m['major_projects_len'] >= 1 %}
-            <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_len']}}</h3>
+            {% 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>
+              <h3>{{m['major_projects_passed_len']}}</h3>
               <p>Major Projects</p>
             </div>
           </div>
         </div>
         <h4>Major Projects:
-        {% for i in range(m['major_projects_len']) %}
-          {{ m['major_projects'][i]['name'] }}{% if i < m['major_projects_len'] - 1 %}, {% endif %}
+        {% for i in range(m['major_projects_passed_len']) %}
+          {{ m['major_projects_passed'][i]['name'] }}{% if i < m['major_projects_passed_len'] - 1 %}, {% endif %}
         {% endfor %}
         </h4>
 

requirements.txt

@@ -9,5 +9,5 @@ structlog
 flask_sqlalchemy
 flask_migrate
 pylint
-psycopg2
+#psycopg2
 raven[flask]