Merge pull request #180 from ComputerScienceHouse/develop

Version 3.3.2

Author: devinmatte

Dockerfile

@@ -28,4 +28,4 @@ RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - && \
 
 RUN ln -sf /usr/share/zoneinfo/America/New_York /etc/localtime
 
-CMD ["gunicorn", "packet:app", "--bind=0.0.0.0:8080", "--access-logfile=-"]
+CMD ["gunicorn", "packet:app", "--bind=0.0.0.0:8080", "--access-logfile=-", "--timeout=600"]

package.json

@@ -1,7 +1,7 @@
 {
   "title": "CSH Packet",
   "name": "csh-packet",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "A web app implementation of the CSH introductory packet.",
   "bugs": {
     "url": "https://github.com/ComputerScienceHouse/packet/issues",

packet/commands.py

@@ -260,7 +260,7 @@ def extend_packet(packet_id):
     else:
         print("Ready to extend packet #{} for {}".format(packet_id, packet.freshman_username))
 
-    packet.end = input_date("Enter the new end date for this packet")
+    packet.end = datetime.combine(input_date("Enter the new end date for this packet"), packet_end_time)
     db.session.commit()
 
     print("Packet successfully extended")

packet/context_processors.py

@@ -12,6 +12,7 @@
 
 
 # pylint: disable=bare-except
+@lru_cache(maxsize=128)
 def get_csh_name(username):
     try:
         member = ldap_get_member(username)

packet/ldap.py

@@ -144,6 +144,8 @@ def ldap_get_eboard_role(member):
         return_val = "R&D"
     elif _ldap_is_member_of_group(member, "eboard-social"):
         return_val = "Social"
+    elif _ldap_is_member_of_group(member, "eboard-secretary"):
+        return_val = "Secretary"
 
     return return_val
 

packet/templates/active_packets.html

@@ -47,12 +47,12 @@ <h4 class="page-title">Active Packets</h4>
                                                          height="25"/> {{ get_rit_name(packet.freshman_username) }}
                                                 </a>
                                             </td>
-                                            <td data-sort="{{ packet.signatures_received_result.upper }}">
-                                                {% if packet.signatures_received_result.upper == packet.signatures_required_result.upper %}
+                                            <td data-sort="{{ packet.signatures_received_result.member_total }}">
+                                                {% if packet.signatures_received_result.member_total == packet.signatures_required_result.member_total %}
                                                     💯 {# 100% emoji #}
                                                 {% else %}
-                                                    {{ packet.signatures_received_result.upper }} /
-                                                    {{ packet.signatures_required_result.upper }}
+                                                    {{ packet.signatures_received_result.member_total }} /
+                                                    {{ packet.signatures_required_result.member_total }}
                                                 {% endif %}
                                             </td>
                                             <td data-sort="{{ packet.signatures_received_result.fresh }}">