Sorting in UI

Author: devinmatte

packet/packet.py

@@ -26,13 +26,15 @@ def sign(signer_username, freshman_username):
 
 
 def get_signatures(freshman_username):
-    packet = Freshman.query.filter_by(rit_username=freshman_username)[0].current_packet()
-    eboard = UpperSignature.query.filter_by(packet_id=packet.id, eboard=True)
-    upper_signatures = UpperSignature.query.filter_by(packet_id=packet.id, eboard=False)
+    packet = Freshman.query.filter_by(rit_username=freshman_username).first().current_packet()
+    eboard = UpperSignature.query.filter_by(packet_id=packet.id, eboard=True).order_by(UpperSignature.signed.desc())
+    upper_signatures = UpperSignature.query.filter_by(packet_id=packet.id, eboard=False).order_by(UpperSignature.signed.desc())
+    fresh_signatures = FreshSignature.query.filter_by(packet_id=packet.id).order_by(FreshSignature.signed.desc())
+    misc_signatures = MiscSignature.query.filter_by(packet_id=packet.id)
     return {'eboard': eboard,
             'upperclassmen': upper_signatures,
-            'freshmen': FreshSignature.query.filter_by(packet_id=packet.id),
-            'misc': MiscSignature.query.filter_by(packet_id=packet.id)}
+            'freshmen': fresh_signatures,
+            'misc': misc_signatures}
 
 
 def get_number_signed(freshman_username):

packet/routes/shared.py

@@ -10,7 +10,7 @@
 @auth.oidc_auth
 @before_request
 def freshman_packet(uid, info=None):
-    freshman = Freshman.query.filter_by(rit_username=uid)[0]
+    freshman = Freshman.query.filter_by(rit_username=uid).first()
     signatures = get_signatures(uid)
     required = sum(get_number_required(uid).values())
     signed = sum(get_number_signed(uid).values())

packet/templates/active_packets.html

@@ -28,7 +28,13 @@ <h3 class="page-title">Active Packets</h3>
                                             {% if packet.is_open() %}
                                                 <tr>
                                                     <td>
-                                                        {{ packet.freshman.name }}
+                                                        <a href="/packet/{{ packet.freshman.rit_username }}">
+                                                            <img class="eval-user-img"
+                                                                 alt="{{ packet.freshman.name }}"
+                                                                 src="https://profiles.csh.rit.edu/image/{{ packet.freshman.rit_username }}"
+                                                                 width="30"
+                                                                 height="30"/> {{ get_freshman_name(packet.freshman.rit_username) }}
+                                                        </a>
                                                     </td>
                                                     <td>
                                                         {{ packet.signatures_received() }}

packet/templates/packet.html

@@ -37,7 +37,7 @@ <h3 class="page-title">{{ freshman.name }}</h3>
                                     </thead>
                                     <tbody>
                                     {% for m in signatures.eboard %}
-                                        <tr>
+                                        <tr {% if m.signed %}style="background-color: #4caf505e" {% endif %}>
                                             <td>
                                                 <img class="eval-user-img" alt="{{ m['member'] }}"
                                                      src="https://profiles.csh.rit.edu/image/{{ m['member'] }}"
@@ -74,7 +74,7 @@ <h3 class="page-title">{{ freshman.name }}</h3>
                                     </thead>
                                     <tbody>
                                     {% for m in signatures.upperclassmen %}
-                                        <tr>
+                                        <tr {% if m.signed %}style="background-color: #4caf505e" {% endif %}>
                                             <td>
                                                 <img class="eval-user-img" alt="{{ m['member'] }}"
                                                      src="https://profiles.csh.rit.edu/image/{{ m['member'] }}"
@@ -111,7 +111,7 @@ <h3 class="page-title">{{ freshman.name }}</h3>
                                     </thead>
                                     <tbody>
                                     {% for m in signatures.freshmen %}
-                                        <tr>
+                                        <tr {% if m.signed %}style="background-color: #4caf505e" {% endif %}>
                                             <td>
                                                 <a href="/packet/{{ m.freshman.rit_username }}">
                                                     <img class="eval-user-img" alt="{{ m.freshman.rit_username }}"
@@ -150,7 +150,7 @@ <h3 class="page-title">{{ freshman.name }}</h3>
                                     </thead>
                                     <tbody>
                                     {% for m in signatures.misc %}
-                                        <tr>
+                                        <tr {% if m.signed %}style="background-color: #4caf505e" {% endif %}>
                                             <td>
                                                 <img class="eval-user-img" alt="{{ m['member'] }}"
                                                      src="https://profiles.csh.rit.edu/image/{{ m['member'] }}"

packet/templates/upperclassman.html

@@ -29,7 +29,7 @@ <h3 class="page-title">{{ get_display_name(member) }}</h3>
                                             <td>
                                                 <a href="/packet/{{ m.packet.freshman.rit_username }}">
                                                     <img class="eval-user-img"
-                                                         alt="{{ m.packet.freshman.rit_username }}"
+                                                         alt="{{ m.packet.freshman.name }}"
                                                          src="https://profiles.csh.rit.edu/image/{{ m.packet.freshman.rit_username }}"
                                                          width="30"
                                                          height="30"/> {{ get_freshman_name(m.packet.freshman.name) }}
@@ -53,4 +53,4 @@ <h3 class="page-title">{{ get_display_name(member) }}</h3>
             </div>
         </div>
     </div>
-{% endblock %}
+{% endblock %}