Merge pull request #30 from devinmatte/master

Massive UI Changes

Author: devinmatte

frontend/scss/partials/_base.scss

@@ -6,4 +6,9 @@ body {
   margin-top: 50px;
 }
 
-@import "global";
+@import "global";
+
+.header {
+  display: flex;
+  justify-content: space-between;
+}

packet/packet.py

@@ -2,6 +2,9 @@
 
 
 def sign(signer_username, freshman_username):
+    if signer_username == freshman_username:
+        return False
+
     freshman_signed = Freshman.query.filter_by(rit_username=freshman_username).first()
     if freshman_signed is None:
         return False

packet/routes/shared.py

@@ -16,9 +16,20 @@ def freshman_packet(uid, info=None):
     signatures = get_signatures(uid)
     required = sum(get_number_required(uid).values())
     signed = sum(get_number_signed(uid).values())
+
+    upperclassmen_required = get_number_required(uid)
+    del upperclassmen_required['freshmen']
+    upperclassmen_required = sum(upperclassmen_required.values())
+
+    upperclassmen_signature = get_number_signed(uid)
+    del upperclassmen_signature['freshmen']
+    upperclassmen_signature = sum(upperclassmen_signature.values())
+
+    upperclassmen_percent = upperclassmen_signature / upperclassmen_required * 100
+
     packet_signed = signed_packet(info['uid'], uid)
     return render_template("packet.html", info=info, signatures=signatures, uid=uid, required=required, signed=signed,
-                           freshman=freshman, packet_signed=packet_signed)
+                           freshman=freshman, packet_signed=packet_signed, upperclassmen_percent=upperclassmen_percent)
 
 
 @app.route("/packets")
@@ -32,6 +43,8 @@ def packets(info=None):
         # User is an upperclassman
         for packet in packets:
             packet.did_sign = False
+            packet.total_signatures = sum(packet.signatures_received().values())
+            packet.required_signatures = sum(packet.signatures_required().values())
 
             for sig in chain(filter(lambda sig: sig.signed, packet.upper_signatures), packet.misc_signatures):
                 if sig.member == info["uid"]:
@@ -41,9 +54,11 @@ def packets(info=None):
         # User is a freshman
         for packet in packets:
             packet.did_sign = False
+            packet.total_signatures = sum(packet.signatures_received().values())
+            packet.required_signatures = sum(packet.signatures_required().values())
 
             for sig in filter(lambda sig: sig.signed, packet.fresh_signatures):
-                if sig.member == info["uid"]:
+                if sig.freshman_username == info["uid"]:
                     packet.did_sign = True
                     break
 

packet/templates/active_packets.html

@@ -37,14 +37,15 @@ <h3 class="page-title">Active Packets</h3>
                                                         </a>
                                                     </td>
                                                     <td>
-                                                        {{ packet.signatures_received() }}
+                                                        {{ packet.total_signatures }}/{{ packet.required_signatures }}
                                                     </td>
-                                                    {% if info.onfloor or info.realm == "csh" %}
+                                                    {% if (info.onfloor and info.uid != packet.freshman.rit_username) or info.realm == "csh" %}
                                                         <td class="sign-packet" align="right">
                                                             {% 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
+                                                                        data-freshman_name="{{ packet.freshman.name }}">
+                                                                    Sign
                                                                 </button>
                                                             {% else %}
                                                                 <button class="btn btn-primary" disabled="disabled"><i