Merge pull request #168 from ComputerScienceHouse/develop

Version 3.3.1

Author: devinmatte

package.json

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

packet/commands.py

@@ -205,7 +205,7 @@ def ldap_sync():
         # pylint: disable=cell-var-from-loop
         upper_sigs = set(map(lambda sig: sig.member, packet.upper_signatures))
         for member in filter(lambda member: member not in upper_sigs, all_upper):
-            UpperSignature(packet=packet, member=member)
+            sig = UpperSignature(packet=packet, member=member)
             sig.eboard = ldap_get_eboard_role(all_upper[sig.member])
             sig.active_rtp = sig.member in rtp
             sig.three_da = sig.member in three_da

packet/context_processors.py

@@ -1,7 +1,8 @@
 """
 Context processors used by the jinja templates
 """
-
+import hashlib
+import urllib
 from functools import lru_cache
 from datetime import datetime
 
@@ -18,6 +19,7 @@ def get_csh_name(username):
     except:
         return username
 
+
 def get_roles(sig):
     """
     Converts a signature's role fields to a dict for ease of access.
@@ -49,6 +51,22 @@ def get_rit_name(username):
         return username
 
 
+# pylint: disable=bare-except
+@lru_cache(maxsize=128)
+def get_rit_image(username):
+    if username:
+        addresses = [username + "@rit.edu", username + "@g.rit.edu"]
+        for addr in addresses:
+            url = "https://gravatar.com/avatar/" + hashlib.md5(addr.encode("utf8")).hexdigest() + ".jpg?d=404&s=250"
+            try:
+                gravatar = urllib.request.urlopen(url)
+                if gravatar.getcode() == 200:
+                    return url
+            except:
+                continue
+    return "https://www.gravatar.com/avatar/freshmen?d=mp&f=y"
+
+
 def log_time(label):
     """
     Used during debugging to log timestamps while rendering templates
@@ -58,4 +76,7 @@ def log_time(label):
 
 @app.context_processor
 def utility_processor():
-    return dict(get_csh_name=get_csh_name, get_rit_name=get_rit_name, log_time=log_time, get_roles=get_roles)
+    return dict(
+        get_csh_name=get_csh_name, get_rit_name=get_rit_name, get_rit_image=get_rit_image, log_time=log_time,
+        get_roles=get_roles
+    )

packet/static/js/tables.js

@@ -3,6 +3,7 @@ $(document).ready(function () {
     $('#active_packets_table').DataTable({
         "searching": true,
         "order": [],
+        "scrollX": false,
         "paging": false,
         "info": false,
         "columnDefs": [

packet/templates/active_packets.html

@@ -42,7 +42,7 @@ <h4 class="page-title">Active Packets</h4>
                                                 <a href="{{ url_for('freshman_packet', packet_id=packet.id) }}">
                                                     <img class="eval-user-img"
                                                          alt="{{ get_rit_name(packet.freshman_username) }}"
-                                                         src="https://www.gravatar.com/avatar/freshmen?d=mp&f=y"
+                                                         src="{{ get_rit_image(packet.freshman_username) }}"
                                                          width="25"
                                                          height="25"/> {{ get_rit_name(packet.freshman_username) }}
                                                 </a>

packet/templates/packet.html

@@ -110,7 +110,7 @@ <h5>Upperclassmen Score - {{ '%0.2f' % upper_score }}%</h5>
                                     <tr {% if sig.signed %}style="background-color: #4caf505e" {% endif %}>
                                         <td>
                                             <img class="eval-user-img" alt="{{ sig.freshman_username }}"
-                                                 src="https://www.gravatar.com/avatar/freshmen?d=mp&f=y"
+                                                 src="{{ get_rit_image(sig.freshman_username) }}"
                                                  width="25" height="25"/>
                                             {{ get_rit_name(sig.freshman_username) }}
                                         </td>

packet/templates/upperclassman.html

@@ -33,7 +33,7 @@ <h3 class="page-title">
                                             <a href="{{ url_for('freshman_packet', packet_id=packet.id) }}">
                                                 <img class="eval-user-img"
                                                      alt="{{ get_rit_name(packet.freshman_username) }}"
-                                                     src="https://www.gravatar.com/avatar/freshmen?d=mp&f=y"
+                                                     src="{{ get_rit_image(packet.freshman_username) }}"
                                                      width="25"
                                                      height="25"/>
                                                 {{ get_rit_name(packet.freshman_username) }}