Only get queue pos if in queue

Author: mbillow

conditional/blueprints/dashboard.py

@@ -64,8 +64,12 @@ def display_dashboard():
                   MemberHouseMeetingAttendance.query.filter(
                       MemberHouseMeetingAttendance.uid == member.uid)]
     spring['hm_missed'] = len([h for h in h_meetings if h[1] == "Absent"])
-    spring['status'] = SpringEval.query.filter(SpringEval.uid == member.uid
-                                               and SpringEval.active).first().status
+    eval_entry = SpringEval.query.filter(SpringEval.uid == member.uid
+                                         and SpringEval.active).first()
+    if eval_entry is not None:
+        spring['status'] = eval_entry.status
+    else:
+        spring['status'] = None
 
     data['spring'] = spring
 
@@ -74,10 +78,7 @@ def display_dashboard():
         housing = dict()
         housing['points'] = member.housingPoints
         housing['room'] = member.roomNumber
-        if housing['room'] is None:
-            housing['queue_pos'] = "%s / %s" % get_queue_position(member.uid)
-        else:
-            housing['queue_pos'] = "N/A"
+        housing['queue_pos'] = get_queue_position(member.uid)
     else:
         housing = None
 

conditional/blueprints/spring_evals.py

@@ -1,6 +1,6 @@
 import uuid
-import structlog
 import datetime
+import structlog
 
 from flask import Blueprint, request
 

conditional/templates/dashboard.html

@@ -108,7 +108,7 @@ <h3 class="panel-title">Freshman Evaluations
                 </div>
             </div>
             {% endif %}
-
+            {% if spring['status'] != None %}
             <div class="panel panel-default">
                 <div class="panel-heading">
                     <h3 class="panel-title">Membership Evaluations
@@ -157,7 +157,7 @@ <h3 class="panel-title">Membership Evaluations
                     </table>
                 </div>
             </div>
-
+            {% endif %}
             {% if conditionals_len != 0 %}
             <div class="panel panel-default">
                 <div class="panel-heading">
@@ -266,14 +266,21 @@ <h3 class="panel-title">Housing Status</h3>
                             <td class="title">Housing Points</td>
                             <td><span class="pull-right">{{housing['points']}}</span></td>
                         </tr>
-                        {% if active %}
+
+                        {% if housing['room'] != None %}
                         <tr>
                             <td class="title">Room Number</td>
                             <td><span class="pull-right">{{housing['room']}}</span></td>
                         </tr>
+                        {% endif %}
+                        {% if housing['queue_pos'][0] != None and housing['room'] == None %}
                         <tr>
                             <td class="title">Housing Queue Position</td>
-                            <td><span class="pull-right">{{housing['queue_pos']}}</span></td>
+                            <td>
+                                <span class="pull-right">
+                                    {{housing['queue_pos'][0]}} / {{housing['queue_pos'][1]}}
+                                </span>
+                            </td>
                         </tr>
                         {% endif %}
                         </tbody>

conditional/util/housing.py

@@ -43,6 +43,6 @@ def get_queue_position(username):
     try:
         index = next(index for (index, d) in enumerate(get_housing_queue())
              if d["uid"] == username) + 1
-    except KeyError:
-        index = 0
+    except (KeyError, StopIteration):
+        index = None
     return (index, len(queue))