Merge pull request #223 from ComputerScienceHouse/bad_standing

Automating group addition and preventing bad_standing

Author: devinmatte

conditional/blueprints/dashboard.py

@@ -10,7 +10,7 @@
 from conditional.util.auth import get_user
 from conditional.util.flask import render_template
 from conditional.util.housing import get_queue_position
-from conditional.util.ldap import ldap_get_active_members
+from conditional.util.ldap import ldap_get_active_members, ldap_is_bad_standing
 from conditional.util.ldap import ldap_is_active
 from conditional.util.ldap import ldap_is_current_student
 from conditional.util.ldap import ldap_is_intromember
@@ -36,6 +36,7 @@ def display_dashboard(user_dict=None):
     data['username'] = user_dict['account'].uid
     data['name'] = user_dict['account'].cn
     data['active'] = ldap_is_active(user_dict['account'])
+    data['bad_standing'] = ldap_is_bad_standing(user_dict['account'])
     data['onfloor'] = ldap_is_onfloor(user_dict['account'])
     data['voting'] = bool(user_dict['account'].uid in can_vote)
     data['student'] = ldap_is_current_student(user_dict['account'])

conditional/blueprints/member_management.py

@@ -27,7 +27,7 @@
 from conditional.blueprints.cache_management import clear_members_cache
 from conditional.blueprints.intro_evals import display_intro_evals
 
-from conditional.util.ldap import ldap_is_eval_director
+from conditional.util.ldap import ldap_is_eval_director, ldap_is_bad_standing
 from conditional.util.ldap import ldap_is_financial_director
 from conditional.util.ldap import ldap_is_active
 from conditional.util.ldap import ldap_is_onfloor
@@ -520,8 +520,10 @@ def member_management_upgrade_user(user_dict=None):
 def member_management_make_user_active(user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
 
-    if not ldap_is_current_student(user_dict['account']) or ldap_is_active(user_dict['account']):
-        return "must be current student and not active", 403
+    if not ldap_is_current_student(user_dict['account']) \
+            or ldap_is_active(user_dict['account']) \
+            or ldap_is_bad_standing(user_dict['account']):
+        return "must be current student, not in bad standing and not active", 403
 
     ldap_set_active(user_dict['account'])
     log.info("Make user {} active".format(user_dict['username']))

conditional/blueprints/slideshow.py

@@ -11,7 +11,8 @@
 from conditional.models.models import SpringEval
 from conditional.util.auth import get_user
 from conditional.util.flask import render_template
-from conditional.util.ldap import ldap_is_eval_director
+from conditional.util.ldap import ldap_is_eval_director, ldap_is_intromember, ldap_set_failed, ldap_set_bad_standing, \
+    ldap_set_inactive, ldap_get_member, ldap_set_not_intro_member
 
 logger = structlog.get_logger()
 
@@ -128,4 +129,18 @@ def slideshow_spring_review(user_dict=None):
 
     db.session.flush()
     db.session.commit()
+
+    # Automate ldap group organizing
+    account = ldap_get_member(uid)
+
+    if status == "Passed":
+        if ldap_is_intromember(account):
+            ldap_set_not_intro_member(account)
+    elif status == "Failed":
+        if ldap_is_intromember(account):
+            ldap_set_failed(account)
+            ldap_set_inactive(account)
+        else:
+            ldap_set_bad_standing(account)
+
     return jsonify({"success": True}), 200

conditional/templates/dashboard.html

@@ -251,7 +251,7 @@ <h3 class="panel-title">Major Projects</h3>
             </div>
             {% endif %}
 
-            {% if accepting_dues and student and not active %}
+            {% if accepting_dues and student and not active and not bad_standing %}
                 <div class="panel panel-info" id="becomeActive">
                     <div class="panel-heading">
                         <h3 class="panel-title">Become Active</h3>

conditional/util/ldap.py

@@ -63,6 +63,10 @@ def ldap_is_active(account):
     return _ldap_is_member_of_group(account, 'active')
 
 
+def ldap_is_bad_standing(account):
+    return _ldap_is_member_of_group(account, 'bad_standing')
+
+
 def ldap_is_alumni(account):
     # If the user is not active, they are an alumni.
     return not _ldap_is_member_of_group(account, 'active')
@@ -122,6 +126,18 @@ def ldap_set_inactive(account):
     ldap_get_member.cache_clear()
 
 
+def ldap_set_intro_member(account):
+    _ldap_add_member_to_group(account, 'intromembers')
+    ldap_get_intro_members().cache_clear()
+    ldap_get_member.cache_clear()
+
+
+def ldap_set_not_intro_member(account):
+    _ldap_remove_member_from_group(account, 'intromembers')
+    ldap_get_intro_members().cache_clear()
+    ldap_get_member.cache_clear()
+
+
 def ldap_set_current_student(account):
     _ldap_add_member_to_group(account, 'current_student')
     ldap_get_current_students.cache_clear()
@@ -133,11 +149,23 @@ def ldap_set_non_current_student(account):
     ldap_get_current_students.cache_clear()
     ldap_get_member.cache_clear()
 
+
+def ldap_set_failed(account):
+    _ldap_add_member_to_group(account, 'failed')
+    ldap_get_member.cache_clear()
+
+
+def ldap_set_bad_standing(account):
+    _ldap_add_member_to_group(account, 'bad_standing')
+    ldap_get_member.cache_clear()
+
+
 def ldap_set_onfloor(account):
     _ldap_add_member_to_group(account, 'onfloor')
     ldap_get_onfloor_members.cache_clear()
     ldap_get_member.cache_clear()
 
+
 def ldap_get_roomnumber(account):
     try:
         return account.roomNumber