Packet Frontend Cleanup

Author: devinmatte

frontend/scss/components/signatures.scss

@@ -0,0 +1,3 @@
+.signature-count {
+  float: right;
+}

frontend/scss/packet.scss

@@ -5,3 +5,4 @@ $csh-pink: #b0197e;
 @import "components/switches";
 @import "components/datatables";
 @import "components/buttons";
+@import "components/signatures";

packet/routes/shared.py

@@ -16,6 +16,7 @@ def freshman_packet(uid, info=None):
     signatures = get_signatures(uid)
     required = sum(get_number_required(uid).values())
     signed = sum(get_number_signed(uid).values())
+    signed_dict = get_number_signed(uid)
 
     upperclassmen_required = get_number_required(uid)
     del upperclassmen_required['freshmen']
@@ -29,7 +30,8 @@ def freshman_packet(uid, info=None):
 
     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, upperclassmen_percent=upperclassmen_percent)
+                           freshman=freshman, packet_signed=packet_signed, upperclassmen_percent=upperclassmen_percent,
+                           signed_dict=signed_dict)
 
 
 @app.route("/packets")

packet/templates/active_packets.html

@@ -37,7 +37,11 @@ <h3 class="page-title">Active Packets</h3>
                                                         </a>
                                                     </td>
                                                     <td>
-                                                        {{ packet.total_signatures }}/{{ packet.required_signatures }}
+                                                        {% if packet.total_signatures == packet.required_signatures %}
+                                                            💯 {# 100% emoji #}
+                                                        {% else %}
+                                                            {{ packet.total_signatures }}/{{ packet.required_signatures }}
+                                                        {% endif %}
                                                     </td>
                                                     {% if (info.onfloor and info.uid != packet.freshman.rit_username) or info.realm == "csh" %}
                                                         <td class="sign-packet" align="right">

packet/templates/packet.html

@@ -30,19 +30,22 @@ <h5>Signatures: {{ signed }}/{{ required }}</h5>
             <div class="card card-body">
                 <div class="row justify-content-between">
                     <div class="col">
+                        <b class="signature-count">{{ '%0.2f' % (signed/required * 100) }}%</b>
                         <h5>Total Score</h5>
                         <div class="progress">
                             <div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar"
                                  aria-valuenow="{{ signed/required * 100 }}" aria-valuemin="0" aria-valuemax="100"
                                  style="width: {{ signed/required * 100 }}%"></div>
                         </div>
+                        <b class="signature-count">{{ '%0.2f' % upperclassmen_percent }}%</b>
                         <h5>Upperclassmen Score</h5>
                         <div class="progress">
                             <div class="progress-bar bg-warning progress-bar-striped progress-bar-animated"
                                  role="progressbar"
                                  aria-valuenow="{{ upperclassmen_percent }}" aria-valuemin="0" aria-valuemax="100"
                                  style="width: {{ upperclassmen_percent }}%"></div>
                         </div>
+
                     </div>
                 </div>
             </div>
@@ -52,6 +55,7 @@ <h5>Upperclassmen Score</h5>
                 <div class="card mb-3">
                     <div class="card-header">
                         <b>EBoard Signatures</b>
+                        <b class="signature-count">{{ signed_dict.eboard }}/{{ signatures.eboard.count() }}</b>
                     </div>
                     <div class="card-body table-fill">
                         <div class="table-responsive">
@@ -79,7 +83,7 @@ <h5>Upperclassmen Score</h5>
                                                 </a>
                                             {% endif %}
                                         </td>
-                                        <td>
+                                        <td width="15%">
                                             {% if m.signed %}
                                                 <i class="fas fa-check"></i>
                                             {% else %}
@@ -96,6 +100,7 @@ <h5>Upperclassmen Score</h5>
                 <div class="card mb-2">
                     <div class="card-header">
                         <b>On-Floor Upperclassmen Signatures</b>
+                        <b class="signature-count">{{ signed_dict.upperclassmen }}/{{ signatures.upperclassmen.count() }}</b>
                     </div>
                     <div class="card-body table-fill">
                         <div class="table-responsive">
@@ -123,7 +128,7 @@ <h5>Upperclassmen Score</h5>
                                                 </a>
                                             {% endif %}
                                         </td>
-                                        <td>
+                                        <td width="15%">
                                             {% if m.signed %}
                                                 <i class="fas fa-check"></i>
                                             {% else %}
@@ -140,6 +145,7 @@ <h5>Upperclassmen Score</h5>
                 <div class="card mb-2">
                     <div class="card-header">
                         <b>On-Floor Freshmen Signatures</b>
+                        <b class="signature-count">{{ signed_dict.freshmen }}/{{ signatures.freshmen.count() }}</b>
                     </div>
                     <div class="card-body table-fill">
                         <div class="table-responsive">
@@ -163,7 +169,7 @@ <h5>Upperclassmen Score</h5>
                                                      height="30"/> {{ get_freshman_name(m.freshman.rit_username) }}
                                             </a>
                                         </td>
-                                        <td>
+                                        <td width="15%">
                                             {% if m.signed %}
                                                 <i class="fas fa-check"></i>
                                             {% else %}
@@ -180,6 +186,7 @@ <h5>Upperclassmen Score</h5>
                 <div class="card mb-2">
                     <div class="card-header">
                         <b>Off-Floor Upperclassmen/Alumni/Advisor Signatures</b>
+                        <b class="signature-count">{{ signatures.misc.count() }}/15</b>
                     </div>
                     <div class="card-body table-fill">
                         <div class="table-responsive">
@@ -188,13 +195,17 @@ <h5>Upperclassmen Score</h5>
                                    data-length-changable="true" data-paginated="false">
                                 <thead>
                                 <tr>
+                                    <th></th>
                                     <th>Name</th>
                                     <th>Signature</th>
                                 </tr>
                                 </thead>
                                 <tbody>
                                 {% for m in signatures.misc %}
                                     <tr {% if m.signed %}style="background-color: #4caf505e" {% endif %}>
+                                        <td width="5%">
+                                            {{ loop.index }}.&nbsp;
+                                        </td>
                                         <td>
                                             {% if info.realm == "csh" %}
                                                 <a href="/member/{{ m.member }}">
@@ -207,7 +218,7 @@ <h5>Upperclassmen Score</h5>
                                                 </a>
                                             {% endif %}
                                         </td>
-                                        <td>
+                                        <td width="15%">
                                             {% if loop.index <= 15 %}
                                                 <i class="fas fa-check"></i>
                                             {% else %}