From 713b7fbd0b2ec9e37f323bb845f30f055c71da82 Mon Sep 17 00:00:00 2001
From: Devin Matte <devinmatte@gmail.com>
Date: Sun, 2 Sep 2018 20:55:33 -0400
Subject: [PATCH 01/12] Members in intromember can't sign with their account

---
 packet/packet.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packet/packet.py b/packet/packet.py
index ecafe10d..835c6636 100644
--- a/packet/packet.py
+++ b/packet/packet.py
@@ -1,3 +1,4 @@
+from packet.ldap import _ldap_is_member_of_group, ldap_get_member
 from .models import Freshman, UpperSignature, FreshSignature, MiscSignature, db
 
 
@@ -26,6 +27,8 @@ def sign(signer_username, freshman_username):
                                                   FreshSignature.packet == packet).first()
 
     if upper_signature:
+        if _ldap_is_member_of_group(ldap_get_member(signer_username), "intromembers"):
+            return False
         upper_signature.signed = True
     elif fresh_signature:
         fresh_signature.signed = True

From 8d117d8a95b068a180b98461f1281add271cdeb3 Mon Sep 17 00:00:00 2001
From: Devin Matte <devinmatte@gmail.com>
Date: Sun, 2 Sep 2018 21:21:49 -0400
Subject: [PATCH 02/12] Cleaning up check orders

---
 packet/packet.py | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/packet/packet.py b/packet/packet.py
index 835c6636..f59de848 100644
--- a/packet/packet.py
+++ b/packet/packet.py
@@ -10,16 +10,8 @@ def sign(signer_username, freshman_username):
     if freshman_signed is None:
         return False
     packet = freshman_signed.current_packet()
-    if packet is None:
+    if packet is None or not packet.is_open():
         return False
-    if not packet.is_open():
-        return False
-
-    # Make sure only on floor freshmen can sign packets
-    freshman_signer = Freshman.query.filter_by(rit_username=signer_username).first()
-    if freshman_signer:
-        if not freshman_signer.onfloor:
-            return False
 
     upper_signature = UpperSignature.query.filter(UpperSignature.member == signer_username,
                                                   UpperSignature.packet == packet).first()
@@ -31,6 +23,11 @@ def sign(signer_username, freshman_username):
             return False
         upper_signature.signed = True
     elif fresh_signature:
+        # Make sure only on floor freshmen can sign packets
+        freshman_signer = Freshman.query.filter_by(rit_username=signer_username).first()
+        if freshman_signer:
+            if not freshman_signer.onfloor:
+                return False
         fresh_signature.signed = True
     else:
         db.session.add(MiscSignature(packet=packet, member=signer_username))

From 0e8f90f283f6415877c4395ba212d835225d06ef Mon Sep 17 00:00:00 2001
From: Collin Tod <squablesquable@gmail.com>
Date: Mon, 3 Sep 2018 00:30:43 -0400
Subject: [PATCH 03/12] Remove unecessary memory usage

member.py assigned a variable to a rvalue that is only ever checked
once, directly below it. It did nothing to cut down on the line length,
in fact it created a new, longer line. Readability is now supplied
through comments, and memory is not wasted every time that
signed_packets() is ran
---
 packet/member.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packet/member.py b/packet/member.py
index a4544ac4..9e4a75b6 100644
--- a/packet/member.py
+++ b/packet/member.py
@@ -2,10 +2,10 @@
 
 
 def signed_packets(member):
-    is_freshman = Freshman.query.filter_by(rit_username=member).first() is not None
-    if is_freshman:
+    # Checks whether or not member is a freshman
+    if Freshman.query.filter_by(rit_username=member).first() is not None:
         return FreshSignature.query.filter_by(freshman_username=member, signed=True).all()
-    is_upper = UpperSignature.query.filter_by(member=member).first() is not None
-    if is_upper:
+    # Checks whether or not member is an upperclassman
+    if UpperSignature.query.filter_by(member=member).first() is not None:
         return UpperSignature.query.filter_by(member=member, signed=True).all()
     return MiscSignature.query.filter_by(member=member).all()

From 262be6b50aa715acee91a6e9215b4620460c900a Mon Sep 17 00:00:00 2001
From: Devin Matte <devinmatte@gmail.com>
Date: Mon, 3 Sep 2018 00:36:19 -0400
Subject: [PATCH 04/12] Fixing intro check and line

---
 packet/packet.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/packet/packet.py b/packet/packet.py
index f59de848..38490fdb 100644
--- a/packet/packet.py
+++ b/packet/packet.py
@@ -1,4 +1,4 @@
-from packet.ldap import _ldap_is_member_of_group, ldap_get_member
+from packet.ldap import ldap_get_member, ldap_is_intromember
 from .models import Freshman, UpperSignature, FreshSignature, MiscSignature, db
 
 
@@ -19,15 +19,14 @@ def sign(signer_username, freshman_username):
                                                   FreshSignature.packet == packet).first()
 
     if upper_signature:
-        if _ldap_is_member_of_group(ldap_get_member(signer_username), "intromembers"):
+        if ldap_is_intromember(ldap_get_member(signer_username)):
             return False
         upper_signature.signed = True
     elif fresh_signature:
         # Make sure only on floor freshmen can sign packets
         freshman_signer = Freshman.query.filter_by(rit_username=signer_username).first()
-        if freshman_signer:
-            if not freshman_signer.onfloor:
-                return False
+        if freshman_signer and not freshman_signer.onfloor:
+            return False
         fresh_signature.signed = True
     else:
         db.session.add(MiscSignature(packet=packet, member=signer_username))

From 71df4deff4920ae146a072a083011b34dad765d5 Mon Sep 17 00:00:00 2001
From: Devin Matte <devinmatte@gmail.com>
Date: Mon, 3 Sep 2018 00:08:11 -0400
Subject: [PATCH 05/12] Packet Frontend Cleanup

---
 frontend/scss/components/signatures.scss |  3 +++
 frontend/scss/packet.scss                |  1 +
 packet/routes/shared.py                  |  4 +++-
 packet/templates/active_packets.html     |  6 +++++-
 packet/templates/packet.html             | 19 +++++++++++++++----
 5 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 frontend/scss/components/signatures.scss

diff --git a/frontend/scss/components/signatures.scss b/frontend/scss/components/signatures.scss
new file mode 100644
index 00000000..db44a89a
--- /dev/null
+++ b/frontend/scss/components/signatures.scss
@@ -0,0 +1,3 @@
+.signature-count {
+  float: right;
+}
diff --git a/frontend/scss/packet.scss b/frontend/scss/packet.scss
index 068124ca..d5f8d6fa 100644
--- a/frontend/scss/packet.scss
+++ b/frontend/scss/packet.scss
@@ -5,3 +5,4 @@ $csh-pink: #b0197e;
 @import "components/switches";
 @import "components/datatables";
 @import "components/buttons";
+@import "components/signatures";
diff --git a/packet/routes/shared.py b/packet/routes/shared.py
index 983936f1..36c2ec52 100644
--- a/packet/routes/shared.py
+++ b/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")
diff --git a/packet/templates/active_packets.html b/packet/templates/active_packets.html
index a8cf1c7d..27d63686 100644
--- a/packet/templates/active_packets.html
+++ b/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">
diff --git a/packet/templates/packet.html b/packet/templates/packet.html
index ecc23fc9..8f6c0e3b 100644
--- a/packet/templates/packet.html
+++ b/packet/templates/packet.html
@@ -30,12 +30,14 @@ <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"
@@ -43,6 +45,7 @@ <h5>Upperclassmen Score</h5>
                                  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,6 +195,7 @@ <h5>Upperclassmen Score</h5>
                                    data-length-changable="true" data-paginated="false">
                                 <thead>
                                 <tr>
+                                    <th></th>
                                     <th>Name</th>
                                     <th>Signature</th>
                                 </tr>
@@ -195,6 +203,9 @@ <h5>Upperclassmen Score</h5>
                                 <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 %}

From 7a13477e49dce568cff32f6d4795ada29a11505d Mon Sep 17 00:00:00 2001
From: Devin Matte <devinmatte@gmail.com>
Date: Mon, 3 Sep 2018 00:59:44 -0400
Subject: [PATCH 06/12] Requests, alignment and image size

---
 frontend/scss/components/buttons.scss |  6 +++++-
 packet/templates/active_packets.html  |  6 +++---
 packet/templates/packet.html          | 22 +++++++++++-----------
 packet/templates/upperclassman.html   |  4 ++--
 4 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/frontend/scss/components/buttons.scss b/frontend/scss/components/buttons.scss
index 2f2ff5fd..596ce6cc 100644
--- a/frontend/scss/components/buttons.scss
+++ b/frontend/scss/components/buttons.scss
@@ -1,4 +1,8 @@
 .sign-packet {
   float: right;
   text-align: right;
-}
\ No newline at end of file
+}
+
+.sign-button {
+  float: right;
+}
diff --git a/packet/templates/active_packets.html b/packet/templates/active_packets.html
index 27d63686..3a6bf969 100644
--- a/packet/templates/active_packets.html
+++ b/packet/templates/active_packets.html
@@ -31,9 +31,9 @@ <h3 class="page-title">Active Packets</h3>
                                                         <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) }}
+                                                                 src="https://www.gravatar.com/avatar/freshmen?d=mp&f=y"
+                                                                 width="25"
+                                                                 height="25"/> {{ get_freshman_name(packet.freshman.rit_username) }}
                                                         </a>
                                                     </td>
                                                     <td>
diff --git a/packet/templates/packet.html b/packet/templates/packet.html
index 8f6c0e3b..1e3ed056 100644
--- a/packet/templates/packet.html
+++ b/packet/templates/packet.html
@@ -10,12 +10,12 @@ <h3>{{ freshman.name }}</h3>
                 <div class="col">
                     {% if (info.onfloor and info.uid != freshman.rit_username) or info.realm == "csh" %}
                         {% if not packet_signed %}
-                            <button class="btn btn-primary sign-button alignright"
+                            <button class="btn btn-primary sign-button"
                                     data-freshman_uid="{{ freshman.rit_username }}"
                                     data-freshman_name="{{ freshman.name }}">Sign
                             </button>
                         {% else %}
-                            <button class="btn btn-primary alignright" disabled="disabled"><i
+                            <button class="btn btn-primary" disabled="disabled"><i
                                     class="fa fa-check"></i>&nbsp;Signed
                             </button>
                         {% endif %}
@@ -77,8 +77,8 @@ <h5>Upperclassmen Score</h5>
                                             {% endif %}
                                             <img class="eval-user-img" alt="{{ m['member'] }}"
                                                  src="https://profiles.csh.rit.edu/image/{{ m['member'] }}"
-                                                 width="30"
-                                                 height="30"/> {{ get_display_name(m.member) }}
+                                                 width="25"
+                                                 height="25"/> {{ get_display_name(m.member) }}
                                             {% if info.realm == "csh" %}
                                                 </a>
                                             {% endif %}
@@ -122,8 +122,8 @@ <h5>Upperclassmen Score</h5>
                                             {% endif %}
                                             <img class="eval-user-img" alt="{{ m['member'] }}"
                                                  src="https://profiles.csh.rit.edu/image/{{ m['member'] }}"
-                                                 width="30"
-                                                 height="30"/> {{ get_display_name(m.member) }}
+                                                 width="25"
+                                                 height="25"/> {{ get_display_name(m.member) }}
                                             {% if info.realm == "csh" %}
                                                 </a>
                                             {% endif %}
@@ -164,9 +164,9 @@ <h5>Upperclassmen Score</h5>
                                         <td>
                                             <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.rit_username) }}
+                                                     src="https://www.gravatar.com/avatar/freshmen?d=mp&f=y"
+                                                     width="25"
+                                                     height="25"/> {{ get_freshman_name(m.freshman.rit_username) }}
                                             </a>
                                         </td>
                                         <td width="15%">
@@ -212,8 +212,8 @@ <h5>Upperclassmen Score</h5>
                                             {% endif %}
                                             <img class="eval-user-img" alt="{{ m['member'] }}"
                                                  src="https://profiles.csh.rit.edu/image/{{ m['member'] }}"
-                                                 width="30"
-                                                 height="30"/> {{ get_display_name(m.member) }}
+                                                 width="25"
+                                                 height="25"/> {{ get_display_name(m.member) }}
                                             {% if info.realm == "csh" %}
                                                 </a>
                                             {% endif %}
diff --git a/packet/templates/upperclassman.html b/packet/templates/upperclassman.html
index 5ffa44f7..01b348cf 100644
--- a/packet/templates/upperclassman.html
+++ b/packet/templates/upperclassman.html
@@ -31,8 +31,8 @@ <h3 class="page-title">{{ get_display_name(member) }}</h3>
                                                     <img class="eval-user-img"
                                                          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) }}
+                                                         width="25"
+                                                         height="25"/> {{ get_freshman_name(m.packet.freshman.name) }}
                                                 </a>
                                             </td>
                                             <td>

From 2a9c1e15fb9c2aa88147a71a38ffc476cc0de051 Mon Sep 17 00:00:00 2001
From: Devin Matte <devinmatte@gmail.com>
Date: Mon, 3 Sep 2018 01:04:02 -0400
Subject: [PATCH 07/12] Upperclassmen Page fix

---
 packet/templates/upperclassman.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packet/templates/upperclassman.html b/packet/templates/upperclassman.html
index 01b348cf..22fdc60d 100644
--- a/packet/templates/upperclassman.html
+++ b/packet/templates/upperclassman.html
@@ -35,7 +35,7 @@ <h3 class="page-title">{{ get_display_name(member) }}</h3>
                                                          height="25"/> {{ get_freshman_name(m.packet.freshman.name) }}
                                                 </a>
                                             </td>
-                                            <td>
+                                            <td width="15%">
                                                 {% if m.signed %}
                                                     <i class="fas fa-check"></i>
                                                 {% else %}

From 5927e4a8d5b201359671c78e392d807b595be017 Mon Sep 17 00:00:00 2001
From: Devin Matte <devinmatte@gmail.com>
Date: Mon, 3 Sep 2018 03:13:37 -0400
Subject: [PATCH 08/12] Order of function calls

---
 packet/routes/shared.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packet/routes/shared.py b/packet/routes/shared.py
index 36c2ec52..ef4c8061 100644
--- a/packet/routes/shared.py
+++ b/packet/routes/shared.py
@@ -14,9 +14,9 @@
 def freshman_packet(uid, info=None):
     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())
     signed_dict = get_number_signed(uid)
+    required = sum(get_number_required(uid).values())
+    signed = sum(signed_dict.values())
 
     upperclassmen_required = get_number_required(uid)
     del upperclassmen_required['freshmen']

From 74f4cb49b0dbe8658aeddcd6d01cf089928dc4e9 Mon Sep 17 00:00:00 2001
From: Devin Matte <devinmatte@gmail.com>
Date: Mon, 3 Sep 2018 03:19:26 -0400
Subject: [PATCH 09/12] Aggressive Caching

---
 packet/ldap.py   | 67 ++++++++++--------------------------------------
 packet/packet.py |  4 +++
 packet/utils.py  | 37 +++-----------------------
 3 files changed, 20 insertions(+), 88 deletions(-)

diff --git a/packet/ldap.py b/packet/ldap.py
index 65639621..564538e5 100644
--- a/packet/ldap.py
+++ b/packet/ldap.py
@@ -1,14 +1,14 @@
 from functools import lru_cache
 
-import ldap
-
 from packet import _ldap
 
 
+@lru_cache(maxsize=4096)
 def _ldap_get_group_members(group):
     return _ldap.get_group(group).get_members()
 
 
+@lru_cache(maxsize=4096)
 def _ldap_is_member_of_group(member, group):
     group_list = member.get("memberOf")
     for group_dn in group_list:
@@ -17,7 +17,7 @@ def _ldap_is_member_of_group(member, group):
     return False
 
 
-@lru_cache(maxsize=1024)
+@lru_cache(maxsize=2048)
 def _ldap_is_member_of_directorship(account, directorship):
     directors = _ldap.get_directorship_heads(directorship)
     for director in directors:
@@ -48,16 +48,6 @@ def ldap_get_onfloor_members():
     return _ldap_get_group_members("onfloor")
 
 
-@lru_cache(maxsize=1024)
-def ldap_get_current_students():
-    return _ldap_get_group_members("current_student")
-
-
-@lru_cache(maxsize=1024)
-def ldap_get_all_members():
-    return _ldap_get_group_members("member")
-
-
 @lru_cache(maxsize=1024)
 def ldap_get_groups(account):
     group_list = account.get("memberOf")
@@ -68,17 +58,6 @@ def ldap_get_groups(account):
     return groups
 
 
-@lru_cache(maxsize=1024)
-def ldap_get_group_desc(group):
-    con = _ldap.get_con()
-    results = con.search_s(
-        "cn=groups,cn=accounts,dc=csh,dc=rit,dc=edu",
-        ldap.SCOPE_SUBTREE,
-        "(cn=%s)" % group,
-        ['description'])
-    return results[0][1]['description'][0].decode('utf-8')
-
-
 @lru_cache(maxsize=1024)
 def ldap_get_eboard():
     members = _ldap_get_group_members("eboard-chairman") + _ldap_get_group_members("eboard-evaluations"
@@ -90,6 +69,7 @@ def ldap_get_eboard():
     return members
 
 
+@lru_cache(maxsize=2048)
 def ldap_get_live_onfloor():
     """
     :return: All upperclassmen who live on floor and are not eboard
@@ -101,67 +81,46 @@ def ldap_get_live_onfloor():
             members.append(member)
     return members
 
+
 # Status checkers
 
+@lru_cache(maxsize=1024)
 def ldap_is_active(account):
     return _ldap_is_member_of_group(account, 'active')
 
 
+@lru_cache(maxsize=1024)
 def ldap_is_alumni(account):
     # If the user is not active, they are an alumni.
     return not _ldap_is_member_of_group(account, 'active')
 
 
+@lru_cache(maxsize=1024)
 def ldap_is_eboard(account):
     return _ldap_is_member_of_group(account, 'eboard')
 
 
+@lru_cache(maxsize=1024)
 def ldap_is_rtp(account):
     return _ldap_is_member_of_group(account, 'rtp')
 
 
+@lru_cache(maxsize=1024)
 def ldap_is_intromember(account):
     return _ldap_is_member_of_group(account, 'intromembers')
 
 
+@lru_cache(maxsize=1024)
 def ldap_is_onfloor(account):
     return _ldap_is_member_of_group(account, 'onfloor')
 
 
+@lru_cache(maxsize=1024)
 def ldap_is_current_student(account):
     return _ldap_is_member_of_group(account, 'current_student')
 
 
-# Directorships
-
-def ldap_is_financial_director(account):
-    return _ldap_is_member_of_directorship(account, 'financial')
-
-
-def ldap_is_eval_director(account):
-    return _ldap_is_member_of_directorship(account, 'evaluations')
-
-
-def ldap_is_chairman(account):
-    return _ldap_is_member_of_directorship(account, 'chairman')
-
-
-def ldap_is_history(account):
-    return _ldap_is_member_of_directorship(account, 'history')
-
-
-def ldap_is_imps(account):
-    return _ldap_is_member_of_directorship(account, 'imps')
-
-
-def ldap_is_social(account):
-    return _ldap_is_member_of_directorship(account, 'Social')
-
-
-def ldap_is_rd(account):
-    return _ldap_is_member_of_directorship(account, 'research')
-
-
+@lru_cache(maxsize=1024)
 def ldap_get_roomnumber(account):
     try:
         return account.roomNumber
diff --git a/packet/packet.py b/packet/packet.py
index 38490fdb..411c6170 100644
--- a/packet/packet.py
+++ b/packet/packet.py
@@ -1,3 +1,5 @@
+from functools import lru_cache
+
 from packet.ldap import ldap_get_member, ldap_is_intromember
 from .models import Freshman, UpperSignature, FreshSignature, MiscSignature, db
 
@@ -48,9 +50,11 @@ def get_signatures(freshman_username):
             'misc': misc_signatures}
 
 
+@lru_cache(maxsize=512)
 def get_number_signed(freshman_username):
     return Freshman.query.filter_by(rit_username=freshman_username).first().current_packet().signatures_received()
 
 
+@lru_cache(maxsize=4096)
 def get_number_required(freshman_username):
     return Freshman.query.filter_by(rit_username=freshman_username).first().current_packet().signatures_required()
diff --git a/packet/utils.py b/packet/utils.py
index 5eceb93c..6eb58ac1 100644
--- a/packet/utils.py
+++ b/packet/utils.py
@@ -45,6 +45,7 @@ def wrapped_function(*args, **kwargs):
     return wrapped_function
 
 
+@lru_cache(maxsize=2048)
 def get_member_info(uid):
     account = ldap_get_member(uid)
 
@@ -52,48 +53,14 @@ def get_member_info(uid):
         "user_obj": account,
         "group_list": ldap_get_groups(account),
         "uid": account.uid,
-        "ritUid": parse_rit_uid(account.ritDn),
         "name": account.cn,
         "active": ldap_is_active(account),
         "onfloor": ldap_is_onfloor(account),
         "room": ldap_get_roomnumber(account),
-        "hp": account.housingPoints,
-        "plex": account.plex,
-        "rn": ldap_get_roomnumber(account),
-        "birthday": parse_date(account.birthday),
-        "memberSince": parse_date(account.memberSince),
-        "lastlogin": parse_date(account.krblastsuccessfulauth),
-        "year": parse_account_year(account.memberSince)
     }
     return member_info
 
 
-def parse_date(date):
-    if date:
-        year = date[0:4]
-        month = date[4:6]
-        day = date[6:8]
-        return month + "-" + day + "-" + year
-    return False
-
-
-def parse_rit_uid(dn):
-    if dn:
-        return dn.split(",")[0][4:]
-
-    return None
-
-
-def parse_account_year(date):
-    if date:
-        year = int(date[0:4])
-        month = int(date[4:6])
-        if month <= 8:
-            year = year - 1
-        return year
-    return None
-
-
 @lru_cache(maxsize=2048)
 def is_on_floor(uid):
     return (Freshman.query.filter_by(rit_username=uid)).first().onfloor
@@ -118,6 +85,7 @@ def signed_packet(signer, freshman):
 @app.context_processor
 def utility_processor():
     # pylint: disable=bare-except
+    @lru_cache(maxsize=4096)
     def get_display_name(username):
         try:
             member = ldap_get_member(username)
@@ -125,6 +93,7 @@ def get_display_name(username):
         except:
             return username
 
+    @lru_cache(maxsize=4096)
     def get_freshman_name(username):
         try:
             freshman = Freshman.query.filter_by(rit_username=username).first()

From d55474720f1eb401db9b3bb5589c667c54faa9d9 Mon Sep 17 00:00:00 2001
From: Devin Matte <devinmatte@gmail.com>
Date: Mon, 3 Sep 2018 15:21:47 -0400
Subject: [PATCH 10/12] Removing unnecessary functions and clearing cache

---
 packet/ldap.py                       | 11 ++++++++---
 packet/packet.py                     |  7 ++++++-
 packet/routes/shared.py              |  3 ++-
 packet/templates/active_packets.html |  2 +-
 packet/templates/packet.html         |  2 +-
 packet/templates/upperclassman.html  |  2 +-
 packet/utils.py                      | 10 +---------
 7 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/packet/ldap.py b/packet/ldap.py
index 564538e5..1e4f153a 100644
--- a/packet/ldap.py
+++ b/packet/ldap.py
@@ -3,12 +3,12 @@
 from packet import _ldap
 
 
-@lru_cache(maxsize=4096)
+@lru_cache(maxsize=1024)
 def _ldap_get_group_members(group):
     return _ldap.get_group(group).get_members()
 
 
-@lru_cache(maxsize=4096)
+@lru_cache(maxsize=2048)
 def _ldap_is_member_of_group(member, group):
     group_list = member.get("memberOf")
     for group_dn in group_list:
@@ -17,7 +17,7 @@ def _ldap_is_member_of_group(member, group):
     return False
 
 
-@lru_cache(maxsize=2048)
+@lru_cache(maxsize=1024)
 def _ldap_is_member_of_directorship(account, directorship):
     directors = _ldap.get_directorship_heads(directorship)
     for director in directors:
@@ -84,6 +84,11 @@ def ldap_get_live_onfloor():
 
 # Status checkers
 
+@lru_cache(maxsize=1024)
+def ldap_is_eval_director(account):
+    return _ldap_is_member_of_directorship(account, 'evaluations')
+
+
 @lru_cache(maxsize=1024)
 def ldap_is_active(account):
     return _ldap_is_member_of_group(account, 'active')
diff --git a/packet/packet.py b/packet/packet.py
index 411c6170..727892cb 100644
--- a/packet/packet.py
+++ b/packet/packet.py
@@ -34,9 +34,14 @@ def sign(signer_username, freshman_username):
         db.session.add(MiscSignature(packet=packet, member=signer_username))
     db.session.commit()
 
+    # Clear functions that read signatures cache
+    get_number_signed.cache_clear()
+    get_signatures.cache_clear()
+
     return True
 
 
+@lru_cache(maxsize=2048)
 def get_signatures(freshman_username):
     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())
@@ -50,7 +55,7 @@ def get_signatures(freshman_username):
             'misc': misc_signatures}
 
 
-@lru_cache(maxsize=512)
+@lru_cache(maxsize=2048)
 def get_number_signed(freshman_username):
     return Freshman.query.filter_by(rit_username=freshman_username).first().current_packet().signatures_received()
 
diff --git a/packet/routes/shared.py b/packet/routes/shared.py
index ef4c8061..4c687697 100644
--- a/packet/routes/shared.py
+++ b/packet/routes/shared.py
@@ -1,7 +1,8 @@
-from flask import render_template
 from datetime import datetime
 from itertools import chain
 
+from flask import render_template
+
 from packet import auth, app
 from packet.models import Freshman, Packet
 from packet.packet import get_signatures, get_number_required, get_number_signed
diff --git a/packet/templates/active_packets.html b/packet/templates/active_packets.html
index 3a6bf969..103cd11d 100644
--- a/packet/templates/active_packets.html
+++ b/packet/templates/active_packets.html
@@ -33,7 +33,7 @@ <h3 class="page-title">Active Packets</h3>
                                                                  alt="{{ packet.freshman.name }}"
                                                                  src="https://www.gravatar.com/avatar/freshmen?d=mp&f=y"
                                                                  width="25"
-                                                                 height="25"/> {{ get_freshman_name(packet.freshman.rit_username) }}
+                                                                 height="25"/> {{ packet.freshman.name }} ({{ packet.freshman.rit_username }})
                                                         </a>
                                                     </td>
                                                     <td>
diff --git a/packet/templates/packet.html b/packet/templates/packet.html
index 1e3ed056..0a3b7518 100644
--- a/packet/templates/packet.html
+++ b/packet/templates/packet.html
@@ -166,7 +166,7 @@ <h5>Upperclassmen Score</h5>
                                                 <img class="eval-user-img" alt="{{ m.freshman.rit_username }}"
                                                      src="https://www.gravatar.com/avatar/freshmen?d=mp&f=y"
                                                      width="25"
-                                                     height="25"/> {{ get_freshman_name(m.freshman.rit_username) }}
+                                                     height="25"/> {{ m.freshman.name }} ({{ m.freshman.rit_username }})
                                             </a>
                                         </td>
                                         <td width="15%">
diff --git a/packet/templates/upperclassman.html b/packet/templates/upperclassman.html
index 22fdc60d..d352cc86 100644
--- a/packet/templates/upperclassman.html
+++ b/packet/templates/upperclassman.html
@@ -32,7 +32,7 @@ <h3 class="page-title">{{ get_display_name(member) }}</h3>
                                                          alt="{{ m.packet.freshman.name }}"
                                                          src="https://profiles.csh.rit.edu/image/{{ m.packet.freshman.rit_username }}"
                                                          width="25"
-                                                         height="25"/> {{ get_freshman_name(m.packet.freshman.name) }}
+                                                         height="25"/> {{ m.packet.freshman.name }} ({{ m.packet.freshman.rit_username }})
                                                 </a>
                                             </td>
                                             <td width="15%">
diff --git a/packet/utils.py b/packet/utils.py
index 6eb58ac1..67730aec 100644
--- a/packet/utils.py
+++ b/packet/utils.py
@@ -93,12 +93,4 @@ def get_display_name(username):
         except:
             return username
 
-    @lru_cache(maxsize=4096)
-    def get_freshman_name(username):
-        try:
-            freshman = Freshman.query.filter_by(rit_username=username).first()
-            return freshman.name + " (" + freshman.rit_username + ")"
-        except:
-            return username
-
-    return dict(get_display_name=get_display_name, get_freshman_name=get_freshman_name)
+    return dict(get_display_name=get_display_name)

From 2ddcb1d5e996cb7919f95398aa042f5f44fa5c64 Mon Sep 17 00:00:00 2001
From: Devin Matte <devinmatte@gmail.com>
Date: Mon, 3 Sep 2018 16:04:37 -0400
Subject: [PATCH 11/12] Caching and cleaning functions

---
 packet/models.py        |  3 +++
 packet/packet.py        | 15 +++++++++++++++
 packet/routes/shared.py | 25 ++++++++-----------------
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/packet/models.py b/packet/models.py
index 5bd3f0a5..62f07de2 100644
--- a/packet/models.py
+++ b/packet/models.py
@@ -3,6 +3,8 @@
 """
 
 from datetime import datetime
+from functools import lru_cache
+
 from sqlalchemy import Column, Integer, String, Text, ForeignKey, DateTime, Boolean
 from sqlalchemy.orm import relationship
 
@@ -47,6 +49,7 @@ class Packet(db.Model):
     def is_open(self):
         return self.start < datetime.now() < self.end
 
+    @lru_cache(maxsize=1024)
     def signatures_required(self):
         eboard = UpperSignature.query.filter_by(eboard=True).count()
         return {'eboard': eboard,
diff --git a/packet/packet.py b/packet/packet.py
index 727892cb..a0827237 100644
--- a/packet/packet.py
+++ b/packet/packet.py
@@ -1,3 +1,4 @@
+import copy
 from functools import lru_cache
 
 from packet.ldap import ldap_get_member, ldap_is_intromember
@@ -37,6 +38,7 @@ def sign(signer_username, freshman_username):
     # Clear functions that read signatures cache
     get_number_signed.cache_clear()
     get_signatures.cache_clear()
+    get_upperclassmen_percent.cache_clear()
 
     return True
 
@@ -63,3 +65,16 @@ def get_number_signed(freshman_username):
 @lru_cache(maxsize=4096)
 def get_number_required(freshman_username):
     return Freshman.query.filter_by(rit_username=freshman_username).first().current_packet().signatures_required()
+
+
+@lru_cache(maxsize=2048)
+def get_upperclassmen_percent(uid):
+    upperclassmen_required = copy.deepcopy(get_number_required(uid))
+    del upperclassmen_required['freshmen']
+    upperclassmen_required = sum(upperclassmen_required.values())
+
+    upperclassmen_signature = copy.deepcopy(get_number_signed(uid))
+    del upperclassmen_signature['freshmen']
+    upperclassmen_signature = sum(upperclassmen_signature.values())
+
+    return upperclassmen_signature / upperclassmen_required * 100
diff --git a/packet/routes/shared.py b/packet/routes/shared.py
index 4c687697..e89401ea 100644
--- a/packet/routes/shared.py
+++ b/packet/routes/shared.py
@@ -5,7 +5,7 @@
 
 from packet import auth, app
 from packet.models import Freshman, Packet
-from packet.packet import get_signatures, get_number_required, get_number_signed
+from packet.packet import get_signatures, get_number_required, get_number_signed, get_upperclassmen_percent
 from packet.utils import before_request, signed_packet
 
 
@@ -14,21 +14,12 @@
 @before_request
 def freshman_packet(uid, info=None):
     freshman = Freshman.query.filter_by(rit_username=uid).first()
+    upperclassmen_percent = get_upperclassmen_percent(uid)
     signatures = get_signatures(uid)
     signed_dict = get_number_signed(uid)
     required = sum(get_number_required(uid).values())
     signed = sum(signed_dict.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, upperclassmen_percent=upperclassmen_percent,
@@ -39,12 +30,12 @@ def freshman_packet(uid, info=None):
 @auth.oidc_auth
 @before_request
 def packets(info=None):
-    packets = Packet.query.filter(Packet.end > datetime.now()).filter(Packet.start < datetime.now()).all()
+    open_packets = Packet.query.filter(Packet.end > datetime.now()).filter(Packet.start < datetime.now()).all()
 
     # Add the did_sign flag
     if app.config["REALM"] == "csh":
         # User is an upperclassman
-        for packet in packets:
+        for packet in open_packets:
             packet.did_sign = False
             packet.total_signatures = sum(packet.signatures_received().values())
             packet.required_signatures = sum(packet.signatures_required().values())
@@ -55,7 +46,7 @@ def packets(info=None):
                     break
     else:
         # User is a freshman
-        for packet in packets:
+        for packet in open_packets:
             packet.did_sign = False
             packet.total_signatures = sum(packet.signatures_received().values())
             packet.required_signatures = sum(packet.signatures_required().values())
@@ -65,7 +56,7 @@ def packets(info=None):
                     packet.did_sign = True
                     break
 
-    packets.sort(key=lambda x: sum(x.signatures_received().values()), reverse=True)
-    packets.sort(key=lambda x: x.did_sign, reverse=True)
+    open_packets.sort(key=lambda x: sum(x.signatures_received().values()), reverse=True)
+    open_packets.sort(key=lambda x: x.did_sign, reverse=True)
 
-    return render_template("active_packets.html", info=info, packets=packets)
+    return render_template("active_packets.html", info=info, packets=open_packets)

From 684a646878636b8130ccda12fd391436b4ac258d Mon Sep 17 00:00:00 2001
From: Devin Matte <devinmatte@gmail.com>
Date: Tue, 4 Sep 2018 11:03:18 -0400
Subject: [PATCH 12/12] Adding proper versioning

---
 package.json                         |  2 +-
 packet/__init__.py                   |  4 ++++
 packet/_version.py                   |  1 +
 packet/templates/include/footer.html |  2 +-
 packet/templates/packet.html         | 25 -------------------------
 5 files changed, 7 insertions(+), 27 deletions(-)
 create mode 100644 packet/_version.py

diff --git a/package.json b/package.json
index d3cc2504..76697313 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "title": "CSH Packet",
   "name": "csh-packet",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "A webpacket for CSH",
   "bugs": {
     "url": "https://github.com/ComputerScienceHouse/packet/issues",
diff --git a/packet/__init__.py b/packet/__init__.py
index 06656faa..1047c375 100644
--- a/packet/__init__.py
+++ b/packet/__init__.py
@@ -10,6 +10,8 @@
 from flask_pyoidc.flask_pyoidc import OIDCAuthentication
 from flask_sqlalchemy import SQLAlchemy
 
+from ._version import __version__
+
 app = Flask(__name__)
 
 # Load default configuration and any environment variable overrides
@@ -19,6 +21,8 @@
 if os.path.exists(os.path.join(os.getcwd(), "config.py")):
     app.config.from_pyfile(os.path.join(os.getcwd(), "config.py"))
 
+app.config["VERSION"] = __version__
+
 # Initialize the extensions
 db = SQLAlchemy(app)
 migrate = Migrate(app, db)
diff --git a/packet/_version.py b/packet/_version.py
new file mode 100644
index 00000000..05527687
--- /dev/null
+++ b/packet/_version.py
@@ -0,0 +1 @@
+__version__ = "3.0.1"
diff --git a/packet/templates/include/footer.html b/packet/templates/include/footer.html
index f000b97f..b1e9bdcf 100644
--- a/packet/templates/include/footer.html
+++ b/packet/templates/include/footer.html
@@ -1,6 +1,6 @@
 <footer class="py-5 bg">
     <div class="container">
-        <p class="m-0 text-center text-white"><a href="https://github.com/ComputerScienceHouse/packet"> CSH Packet 3.0.0</a>
+        <p class="m-0 text-center text-white"><a href="https://github.com/ComputerScienceHouse/packet"> CSH Packet {{ config["VERSION"] }}</a>
         </p>
     </div>
 </footer>
diff --git a/packet/templates/packet.html b/packet/templates/packet.html
index 0a3b7518..6056c105 100644
--- a/packet/templates/packet.html
+++ b/packet/templates/packet.html
@@ -62,12 +62,6 @@ <h5>Upperclassmen Score</h5>
                             <table class="table table-striped no-bottom-margin" data-module="table"
                                    data-searchable="true" data-sort-column="3" data-sort-order="asc"
                                    data-length-changable="true" data-paginated="false">
-                                <thead>
-                                <tr>
-                                    <th>Name</th>
-                                    <th>Signature</th>
-                                </tr>
-                                </thead>
                                 <tbody>
                                 {% for m in signatures.eboard %}
                                     <tr {% if m.signed %}style="background-color: #4caf505e" {% endif %}>
@@ -107,12 +101,6 @@ <h5>Upperclassmen Score</h5>
                             <table class="table table-striped no-bottom-margin" data-module="table"
                                    data-searchable="true" data-sort-column="3" data-sort-order="asc"
                                    data-length-changable="true" data-paginated="false">
-                                <thead>
-                                <tr>
-                                    <th>Name</th>
-                                    <th>Signature</th>
-                                </tr>
-                                </thead>
                                 <tbody>
                                 {% for m in signatures.upperclassmen %}
                                     <tr {% if m.signed %}style="background-color: #4caf505e" {% endif %}>
@@ -152,12 +140,6 @@ <h5>Upperclassmen Score</h5>
                             <table class="table table-striped no-bottom-margin" data-module="table"
                                    data-searchable="true" data-sort-column="3" data-sort-order="asc"
                                    data-length-changable="true" data-paginated="false">
-                                <thead>
-                                <tr>
-                                    <th>Name</th>
-                                    <th>Signature</th>
-                                </tr>
-                                </thead>
                                 <tbody>
                                 {% for m in signatures.freshmen %}
                                     <tr {% if m.signed %}style="background-color: #4caf505e" {% endif %}>
@@ -193,13 +175,6 @@ <h5>Upperclassmen Score</h5>
                             <table class="table table-striped no-bottom-margin" data-module="table"
                                    data-searchable="true" data-sort-column="3" data-sort-order="asc"
                                    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 %}>