Merge pull request #54 from ComputerScienceHouse/develop

Hotfix 1.0.2a

Author: mbillow

.pylintrc

@@ -83,7 +83,7 @@ ignored-argument-names = _.*
 max-locals = 15
 max-returns = 6
 max-branches = 12
-max-statements = 50
+max-statements = 55
 max-parents = 7
 max-attributes = 10
 min-public-methods = 2

conditional/__init__.py

@@ -24,6 +24,7 @@
 from conditional.blueprints.conditional import conditionals_bp
 from conditional.blueprints.member_management import member_management_bp
 from conditional.blueprints.slideshow import slideshow_bp
+from conditional.blueprints.cache_management import cache_bp
 
 app.register_blueprint(dashboard_bp)
 app.register_blueprint(attendance_bp)
@@ -35,6 +36,7 @@
 app.register_blueprint(conditionals_bp)
 app.register_blueprint(member_management_bp)
 app.register_blueprint(slideshow_bp)
+app.register_blueprint(cache_bp)
 
 logger.info('conditional started')
 

conditional/blueprints/cache_management.py

@@ -0,0 +1,62 @@
+import structlog
+
+from conditional.util.ldap import ldap_is_eval_director
+from conditional.util.ldap import ldap_get_housing_points
+from conditional.util.ldap import ldap_get_active_members
+from conditional.util.ldap import ldap_get_intro_members
+from conditional.util.ldap import ldap_get_non_alumni_members
+from conditional.util.ldap import ldap_get_onfloor_members
+from conditional.util.ldap import ldap_get_current_students
+from conditional.util.ldap import ldap_get_name
+
+from flask import Blueprint, request, redirect
+
+logger = structlog.get_logger()
+cache_bp = Blueprint('cache_bp', __name__)
+
+
+@cache_bp.route('/clearcache')
+def clear_cache():
+    user_name = request.headers.get('x-webauth-user')
+
+    if not ldap_is_eval_director(user_name):
+        return redirect("/dashboard")
+
+    logger.info('api', action='purge system cache')
+
+    ldap_get_housing_points.cache_clear()
+    ldap_get_active_members.cache_clear()
+    ldap_get_intro_members.cache_clear()
+    ldap_get_non_alumni_members.cache_clear()
+    ldap_get_onfloor_members.cache_clear()
+    ldap_get_current_students.cache_clear()
+    ldap_get_name.cache_clear()
+    return "cache cleared", 200
+
+
+def clear_housing_points_cache():
+    ldap_get_housing_points.cache_clear()
+
+
+def clear_active_members_cache():
+    ldap_get_active_members.cache_clear()
+
+
+def clear_intro_members_cache():
+    ldap_get_intro_members.cache_clear()
+
+
+def clear_non_alumni_cache():
+    ldap_get_non_alumni_members.cache_clear()
+
+
+def clear_onfloor_members_cache():
+    ldap_get_onfloor_members.cache_clear()
+
+
+def clear_current_students_cache():
+    ldap_get_current_students.cache_clear()
+
+
+def clear_user_cache(username):
+    ldap_get_name(username).cache_clear()

conditional/blueprints/dashboard.py

@@ -9,6 +9,8 @@
 from conditional.util.ldap import ldap_get_housing_points
 from conditional.util.ldap import ldap_is_intromember
 from conditional.util.ldap import ldap_get_name
+from conditional.util.ldap import ldap_get_active_members
+from conditional.util.ldap import ldap_get_intro_members
 
 from conditional.models.models import FreshmanEvalData
 from conditional.models.models import MemberCommitteeAttendance
@@ -63,6 +65,26 @@ def get_freshman_data(user_name):
     return freshman
 
 
+def get_voting_members():
+    voting_list = []
+    active_members = [x['uid'][0].decode('utf-8') for x
+                      in ldap_get_active_members()]
+    intro_members = [x['uid'][0].decode('utf-8') for x
+                     in ldap_get_intro_members()]
+    passed_fall = FreshmanEvalData.query.filter(
+        FreshmanEvalData.freshman_eval_result == "Passed"
+    ).distinct()
+
+    for intro_member in passed_fall:
+        voting_list.append(intro_member.uid)
+
+    for active_member in active_members:
+        if active_member not in intro_members:
+            voting_list.append(active_member)
+
+    return voting_list
+
+
 @dashboard_bp.route('/dashboard/')
 def display_dashboard():
     log = logger.new(user_name=request.headers.get("x-webauth-user"),
@@ -73,6 +95,8 @@ def display_dashboard():
 
     user_name = request.headers.get('x-webauth-user')
 
+    can_vote = get_voting_members()
+    logger.info('backend', action=can_vote)
     data = dict()
     data['username'] = user_name
     data['name'] = ldap_get_name(user_name)
@@ -81,7 +105,7 @@ def display_dashboard():
     # On-Floor Status
     data['onfloor'] = ldap_is_onfloor(user_name)
     # Voting Status
-    data['voting'] = ldap_is_active(user_name)  # FIXME: unimplemented
+    data['voting'] = bool(user_name in can_vote)
 
     # freshman shit
     if ldap_is_intromember(user_name):

conditional/blueprints/member_management.py

@@ -21,6 +21,9 @@
 from conditional.models.models import OnFloorStatusAssigned
 from conditional.models.models import SpringEval
 
+from conditional.blueprints.cache_management import clear_active_members_cache
+from conditional.blueprints.cache_management import clear_onfloor_members_cache
+
 from conditional.util.ldap import ldap_is_eval_director
 from conditional.util.ldap import ldap_is_financial_director
 from conditional.util.ldap import ldap_set_roomnumber
@@ -261,6 +264,7 @@ def member_management_edituser(uid):
                     {
                         'active': False
                     })
+            clear_active_members_cache()
     else:
         logger.info('backend', action="edit freshman account %s room: %s onfloor: %s eval_date: %s" %
             (uid, post_data['roomNumber'], post_data['onfloorStatus'],
@@ -454,4 +458,7 @@ def member_management_upgrade_user():
 
     db.session.flush()
     db.session.commit()
+
+    clear_onfloor_members_cache()
+
     return jsonify({"success": True}), 200

conditional/templates/intro_evals.html

@@ -28,6 +28,8 @@ <h6 class="eval-uid">{{m['uid']}}</h6>
                             <div class="text-center">
                                 {% if m['signatures_missed'] > 0 %}
                                 <div class="eval-info-label danger">Signatures Missed: {{m['signatures_missed']}}</div>
+                                {% elif m['signatures_missed'] == 65535 %}
+                                <div class="eval-info-label warning">Packet Not Yet Complete</div>
                                 {% else %}
                                 <div class="eval-info-label success">Signatures Missed: {{m['signatures_missed']}}</div>
                                 {% endif %}

conditional/util/ldap.py

@@ -240,14 +240,4 @@ def ldap_set_inactive(username):
 
 @lru_cache(maxsize=1024)
 def ldap_get_name(username):
-    first = __ldap_get_field__(username, 'givenName')
-    if first is None:
-        first = ""
-    else:
-        first = first.decode('utf-8')
-    last = __ldap_get_field__(username, 'sn')
-    if last is None:
-        last = ""
-    else:
-        last = last.decode('utf-8')
-    return "{first} {last}".format(first=first, last=last)
+    return __ldap_get_field__(username, 'cn').decode('utf-8')

frontend/stylesheets/partials/_global.scss

@@ -40,7 +40,7 @@
 }
 
 .warning {
-  background-color: #ff3207;
+  background-color: #fb3;
 }
 
 .success {