Merge pull request #20 from ComputerScienceHouse/current-packets-page

Add current packets collection logic

Author: devinmatte

packet/routes/shared.py

@@ -1,4 +1,6 @@
 from flask import render_template
+from datetime import datetime
+from itertools import chain
 
 from packet import auth, app
 from packet.models import Freshman, Packet
@@ -23,5 +25,19 @@ def freshman_packet(uid, info=None):
 @auth.oidc_auth
 @before_request
 def packets(info=None):
-    packets = Packet.query.all()
+    packets = Packet.query.filter(Packet.end > datetime.now()).filter(Packet.start < datetime.now()).all()
+
+    # Add the did_sign flag
+    if app.config["REALM"] == "csh":
+        # User is an upperclassman
+        for packet in packets:
+            for sig in filter(lambda sig: sig.member == info["uid"], chain(packet.upper_signatures,
+                                                                           packet.misc_signatures)):
+                packet.did_sign = sig.signed
+    else:
+        # User is a freshman
+        for packet in packets:
+            for sig in filter(lambda sig: sig.freshman_username == info["uid"], packet.fresh_signatures):
+                packet.did_sign = sig.signed
+
     return render_template("active_packets.html", info=info, packets=packets)

packet/templates/active_packets.html

@@ -26,7 +26,7 @@ <h3 class="page-title">Active Packets</h3>
                                         <tbody>
                                         {% for packet in packets %}
                                             {% if packet.is_open() %}
-                                                <tr>
+                                                <tr {% if packet.did_sign %}style="background-color: #4caf505e" {% endif %}>
                                                     <td>
                                                         <a href="/packet/{{ packet.freshman.rit_username }}">
                                                             <img class="eval-user-img"
@@ -41,7 +41,7 @@ <h3 class="page-title">Active Packets</h3>
                                                     </td>
                                                     {% if info.onfloor or info.realm == "csh" %}
                                                         <td class="sign-packet" align="right">
-                                                            {% if not packet_signed %}
+                                                            {% if not packet.did_sign %}
                                                                 <button class="btn btn-primary sign-button"
                                                                         data-freshman_uid="{{ packet.freshman.rit_username }}"
                                                                         data-freshman_name="{{ packet.freshman.name }}">Sign