Update calculations based on new co-op changes

Author: mbillow

conditional/blueprints/attendance.py

@@ -67,7 +67,15 @@ def get_non_alumni_non_coop(internal=False):
 
     # Get all active members as a base house meeting attendance.
     active_members = ldap_get_active_members()
-    coop_members = [u.uid for u in CurrentCoops.query.all()]
+
+    if datetime.today() < datetime(start_of_year().year, 12, 31):
+        semester = 'Fall'
+    else:
+        semester = 'Spring'
+
+    coop_members = [u.uid for u in CurrentCoops.query.filter(
+        CurrentCoops.date_created > start_of_year(),
+        CurrentCoops.semester == semester).all()]
 
     eligible_members = [
         {

conditional/blueprints/co_op.py

@@ -14,14 +14,15 @@
 logger = structlog.get_logger()
 
 @co_op_bp.route('/co_op/')
-def display_conditionals():
+def display_co_op_form():
     log = logger.new(user_name=request.headers.get("x-webauth-user"),
                      request_id=str(uuid.uuid4()))
     log.info('frontend', action='display conditional listing page')
 
     # get user data
     user_name = request.headers.get('x-webauth-user')
-    co_op = CurrentCoops.query.filter(CurrentCoops.uid == user_name, CurrentCoops.date_created > start_of_year()).first()
+    co_op = CurrentCoops.query.filter(
+        CurrentCoops.uid == user_name, CurrentCoops.date_created > start_of_year()).first()
 
     return render_template(request,
                            'co_op.html',
@@ -31,7 +32,7 @@ def display_conditionals():
 
 
 @co_op_bp.route('/co_op/submit', methods=['POST'])
-def submit_major_project():
+def submit_co_op_form():
     log = logger.new(user_name=request.headers.get("x-webauth-user"),
                      request_id=str(uuid.uuid4()))
 
@@ -41,13 +42,13 @@ def submit_major_project():
     semester = post_data['semester']
 
     log.info('api', action='Submit %s Co-Op' % semester)
-    
+
     if CurrentCoops.query.filter(CurrentCoops.uid == user_name, CurrentCoops.date_created > start_of_year()).first():
         return "User has already submitted this form!", 403
-    
+
     co_op = CurrentCoops(uid=user_name, semester=semester)
     db.session.add(co_op)
     db.session.flush()
     db.session.commit()
-    
-    return jsonify({"success": True}), 200
+
+    return jsonify({"success": True}), 200

conditional/util/member.py

@@ -1,4 +1,5 @@
 from functools import lru_cache
+from datetime import datetime
 
 from conditional.util.ldap import ldap_get_active_members
 from conditional.util.ldap import ldap_get_intro_members
@@ -15,21 +16,32 @@
 from conditional.models.models import MemberCommitteeAttendance
 from conditional.models.models import TechnicalSeminar
 from conditional.models.models import HouseMeeting
+from conditional.models.models import CurrentCoops
 
 from conditional import start_of_year
 
 
 @lru_cache(maxsize=1024)
 def get_voting_members():
+
+    if datetime.today() < datetime(start_of_year().year, 12, 31):
+        semester = 'Fall'
+    else:
+        semester = 'Spring'
+
     voting_list = [uid for uid in [member.uid for member in ldap_get_active_members()]
-                   if uid not in [member.uid for member in ldap_get_intro_members()]]
+                   if uid not in [member.uid for member in ldap_get_intro_members()] and
+                   uid not in [member.uid for member in CurrentCoops.query.filter(
+                       CurrentCoops.date_created > start_of_year(),
+                       CurrentCoops.semester == semester).all()]]
 
     passed_fall = FreshmanEvalData.query.filter(
         FreshmanEvalData.freshman_eval_result == "Passed"
     ).distinct()
 
     for intro_member in passed_fall:
-        voting_list.append(intro_member.uid)
+        if intro_member.uid not in voting_list:
+            voting_list.append(intro_member.uid)
 
     return voting_list