Merge pull request #81 from devinmatte/fixing_end

Fixing end and if errors

Author: devinmatte

packet/member.py

@@ -113,11 +113,13 @@ def query_signed_intromember(member):
     :param member: the user making the query
     :return: list of results matching the query
     """
-    try:
-        return db.engine.execute("""
+
+    s = """
             SELECT DISTINCT packet.freshman_username AS username, signature_fresh.signed AS signed FROM packet 
             INNER JOIN signature_fresh ON packet.id = signature_fresh.packet_id 
-            WHERE signature_fresh.freshman_username = """ + member + ";")
+            WHERE signature_fresh.freshman_username = ':member';"""
+    try:
+        return db.engine.execute(s, member=member)
 
     except exc.SQLAlchemyError:
         raise exc.SQLAlchemyError("Error: Failed to get intromember's signatures from database")
@@ -129,11 +131,14 @@ def query_signed_upperclassman(member):
     :param member: the user making the query
     :return: list of results matching the query
     """
-    try:
-        return db.engine.execute("""
+
+    s = """
             SELECT DISTINCT packet.freshman_username AS username, signature_upper.signed AS signed FROM packet 
             INNER JOIN signature_upper ON packet.id = signature_upper.packet_id 
-            WHERE signature_upper.member = '""" + member + "';")
+            WHERE signature_upper.member = ':member';"""
+
+    try:
+        return db.engine.execute(s, member=member)
 
     except exc.SQLAlchemyError:
         raise exc.SQLAlchemyError("Error: Failed to get upperclassman's signatures from database")
@@ -145,11 +150,14 @@ def query_signed_alumni(member):
     :param member: the user making the query
     :return: list of results matching the query
     """
-    try:
-        return db.engine.execute("""
+
+    s = """
             SELECT DISTINCT packet.freshman_username AS username, signature_misc.member AS signed 
             FROM packet LEFT OUTER JOIN signature_misc ON packet.id = signature_misc.packet_id 
-            WHERE signature_misc.member = '""" + member + "' OR signature_misc.member ISNULL;")
+            WHERE signature_misc.member = ':member' OR signature_misc.member ISNULL;"""
+
+    try:
+        return db.engine.execute(s, member=member)
 
     except exc.SQLAlchemyError:
         raise exc.SQLAlchemyError("Error: Failed to get alumni's signatures from database")

packet/templates/active_packets.html

@@ -1,7 +1,5 @@
 {% extends "extend/base.html" %}
 
-{% set can_sign = (info.onfloor and info.uid != packet.rit_username) or info.realm == "csh" %}
-
 {% block body %}
     <div class="container main">
         <div class="row mobile-hide">
@@ -11,6 +9,7 @@ <h3 class="page-title">Active Packets</h3>
         </div>
         <div id="eval-blocks">
             {% if packets|length > 0 %}
+                {% set can_sign = info.onfloor or info.realm == "csh" %}
                 <div id="eval-table">
                     <div class="card">
                         <div class="card-body table-fill">
@@ -48,13 +47,13 @@ <h3 class="page-title">Active Packets</h3>
                                             </td>
                                             {% if can_sign %}
                                                 <td class="sign-packet" align="right">
-                                                    {% if not packet.did_sign %}
+                                                    {% if not packet.did_sign and info.uid != packet.rit_username %}
                                                         <button class="btn btn-sm btn-primary sign-button"
                                                                 data-freshman_uid="{{ packet.rit_username }}"
                                                                 data-freshman_name="{{ packet.name }}">
                                                             Sign
                                                         </button>
-                                                    {% else %}
+                                                    {% elif info.uid != packet.rit_username %}
                                                         <button class="btn btn-sm btn-primary signed-button"
                                                                 disabled="disabled"><i
                                                                 class="fa fa-check"></i>&nbsp;Signed