Showing data for on and off floor upperclassmen

Author: devinmatte

packet/routes/upperclassmen.py

@@ -1,7 +1,10 @@
+from datetime import datetime
+from itertools import chain
+
 from flask import redirect, render_template
 
 from packet import auth, app
-from packet.models import UpperSignature
+from packet.models import Packet
 from packet.utils import before_request
 
 
@@ -15,5 +18,16 @@ def index():
 @auth.oidc_auth
 @before_request
 def upperclassman(uid, info=None):
-    signatures = UpperSignature.query.filter_by(member=uid).order_by(UpperSignature.signed.desc())
-    return render_template("upperclassman.html", info=info, signatures=signatures, member=uid)
+    open_packets = Packet.query.filter(Packet.end > datetime.now()).filter(Packet.start < datetime.now()).all()
+
+    for packet in open_packets:
+        packet.did_sign = False
+
+        for sig in chain(filter(lambda sig: sig.signed, packet.upper_signatures), packet.misc_signatures):
+            if sig.member == uid:
+                packet.did_sign = True
+                break
+
+    open_packets.sort(key=lambda x: x.did_sign, reverse=True)
+
+    return render_template("upperclassman.html", info=info, open_packets=open_packets, member=uid)

packet/templates/upperclassman.html

@@ -23,20 +23,20 @@ <h3 class="page-title">{{ get_display_name(member) }}</h3>
                                     </tr>
                                     </thead>
                                     <tbody>
-                                    {% for m in signatures %}
+                                    {% for packet in open_packets %}
                                         {# Using inline style because of how themeswitcher loads the css theme :( #}
-                                        <tr {% if m.signed %}style="background-color: #4caf505e" {% endif %}>
+                                        <tr {% if packet.did_sign %}style="background-color: #4caf505e" {% endif %}>
                                             <td>
-                                                <a href="/packet/{{ m.packet.freshman.rit_username }}">
+                                                <a href="/packet/{{ packet.freshman.rit_username }}">
                                                     <img class="eval-user-img"
-                                                         alt="{{ m.packet.freshman.name }}"
-                                                         src="https://profiles.csh.rit.edu/image/{{ m.packet.freshman.rit_username }}"
+                                                         alt="{{ packet.freshman.name }}"
+                                                         src="https://profiles.csh.rit.edu/image/{{ packet.freshman.rit_username }}"
                                                          width="25"
-                                                         height="25"/> {{ m.packet.freshman.name }} ({{ m.packet.freshman.rit_username }})
+                                                         height="25"/> {{ packet.freshman.name }} ({{ packet.freshman.rit_username }})
                                                 </a>
                                             </td>
                                             <td width="15%">
-                                                {% if m.signed %}
+                                                {% if packet.did_sign %}
                                                     <i class="fas fa-check"></i>
                                                 {% else %}
                                                     <i class="fas fa-times"></i>