Better Signature displays

Author: devinmatte

packet/packet.py

@@ -37,8 +37,8 @@ def get_signatures(freshman_username):
 
 
 def get_number_signed(freshman_username):
-    return Freshman.query.filter_by(rit_username=freshman_username)[0].current_packet().signatures_received()
+    return Freshman.query.filter_by(rit_username=freshman_username).first().current_packet().signatures_received()
 
 
 def get_number_required(freshman_username):
-    return Freshman.query.filter_by(rit_username=freshman_username)[0].current_packet().signatures_required()
+    return Freshman.query.filter_by(rit_username=freshman_username).first().current_packet().signatures_required()

packet/routes/shared.py

@@ -12,8 +12,8 @@
 def freshman_packet(uid, info=None):
     freshman = Freshman.query.filter_by(rit_username=uid)[0]
     signatures = get_signatures(uid)
-    required = get_number_required(uid)
-    signed = get_number_signed(uid)
+    required = sum(get_number_required(uid).values())
+    signed = sum(get_number_signed(uid).values())
     return render_template("packet.html", info=info, signatures=signatures, uid=uid, required=required, signed=signed,
                            freshman=freshman)
 

packet/templates/packet.html

@@ -9,6 +9,16 @@ <h3 class="page-title">{{ freshman.name }}</h3>
         </div>
         <div>
             Signatures: {{ signed }}/{{ required }}
+            {# if not signed #}
+            <button class="btn btn-primary sign-button"
+                    data-freshman_uid="{{ freshman.rit_username }}"
+                    data-freshman_name="{{ freshman.name }}">Sign
+            </button>
+            {# else if signed #}
+            <button class="btn btn-primary" disabled="disabled"><i
+                    class="fa fa-check"></i>&nbsp;Signed
+            </button>
+            {# endif #}
         </div>
         <div id="eval-blocks">
             <div id="eval-table">
@@ -103,11 +113,11 @@ <h3 class="page-title">{{ freshman.name }}</h3>
                                     {% for m in signatures.freshmen %}
                                         <tr>
                                             <td>
-                                                <a href="/packet/{{ m.freshman }}">
-                                                    <img class="eval-user-img" alt="{{ m.freshman }}"
-                                                         src="https://profiles.csh.rit.edu/image/{{ m.freshman }}"
+                                                <a href="/packet/{{ m.freshman.rit_username }}">
+                                                    <img class="eval-user-img" alt="{{ m.freshman.rit_username }}"
+                                                         src="https://profiles.csh.rit.edu/image/{{ m.freshman.rit_username }}"
                                                          width="30"
-                                                         height="30"/> {{ get_freshman_name(m.freshman) }}
+                                                         height="30"/> {{ get_freshman_name(m.freshman.rit_username) }}
                                                 </a>
                                             </td>
                                             <td>
@@ -165,4 +175,4 @@ <h3 class="page-title">{{ freshman.name }}</h3>
             </div>
         </div>
     </div>
-{% endblock %}
+{% endblock %}