Merge pull request #85 from ComputerScienceHouse/develop

Conditional 1.2

Author: stevenmirabito

.sass-lint.yml

@@ -4,6 +4,8 @@ files:
   include: 'frontend/stylesheets/**/*.s+(a|c)ss'
   ignore:
     - 'frontend/stylesheets/components/sweet-alert/**'
+    - 'frontend/stylesheets/components/reveal/**'
+    - 'frontend/stylesheets/presentations.scss'
 rules:
   # Extends
   extends-before-mixins: 1
@@ -93,4 +95,4 @@ rules:
 
   # Final Items
   trailing-semicolon: 1
-  final-newline: 1
+  final-newline: 1

README.md

@@ -1,7 +1,7 @@
 Conditional
 ===========
 
-[![Build Status](https://travis-ci.org/ComputerScienceHouse/conditional.svg?branch=travis-ci)](https://travis-ci.org/ComputerScienceHouse/conditional)
+[![Build Status](https://travis-ci.org/ComputerScienceHouse/conditional.svg)](https://travis-ci.org/ComputerScienceHouse/conditional)
 
 A comprehensive membership evaluations solution for Computer Science House.
 
@@ -14,6 +14,7 @@ To run the application, you must have the latest version of [Python 3](https://w
 virtualenv .conditionalenv -p `which python3`
 source .conditionalenv/bin/activate
 pip install -r requirements.txt
+export FLASK_APP=app.py
 ```
 
 In addition, you must have Node, NPM, and Gulp CLI installed to properly execute the asset pipeline. If you don't have Node installed, we recommending installing with [NVM](https://github.com/creationix/nvm):
@@ -30,12 +31,7 @@ Then, install the pipeline and frontend dependencies:
 npm install
 ```
 
-You must create `config.py` in the top-level directory with the appropriate credentials for the application to run. See `config.sample.py` for an example. To perform the initial database migration, run the following commands before starting the application:
-
-```
-pip install pymysql
-flask zoo
-```
+You must create `config.py` in the top-level directory with the appropriate credentials for the application to run. See `config.sample.py` for an example.
 
 Once you have all of the dependencies installed, simply run:
 
@@ -62,3 +58,12 @@ flask db migrate
 The new migration script in `migrations/versions` should be verified before being committed, as Alembic may not detect every change you make to the models.
 
 For more information, refer to the [Flask-Migrate](https://flask-migrate.readthedocs.io/) documentation.
+
+### Old Evals DB Migration
+
+Conditional includes a utility to facilitate data migrations from the old Evals DB. This isn't necessary to run Conditional. To perform this migration, run the following commands before starting the application:
+
+```
+pip install pymysql
+flask zoo
+```

conditional/blueprints/attendance.py

@@ -74,7 +74,7 @@ def get_non_alumni_non_coop(internal=False):
     # Only Members Who Have Paid Dues Are Required to
     # go to house meetings
     non_alumni_members = ldap_get_active_members()
-    coop_members = [u.username for u in CurrentCoops.query.all()]
+    coop_members = [u.uid for u in CurrentCoops.query.all()]
 
     named_members = [
         {

conditional/blueprints/dashboard.py

@@ -22,6 +22,8 @@
 from conditional.models.models import HouseMeeting
 from conditional.models.models import CommitteeMeeting
 
+from conditional.blueprints.member_management import get_members_info
+
 from conditional.util.housing import get_queue_length, get_queue_position
 from conditional.util.flask import render_template
 
@@ -106,6 +108,9 @@ def display_dashboard():
     # Voting Status
     data['voting'] = bool(user_name in can_vote)
 
+    active_list = get_members_info()[0]
+    data['voting_count'] = {"Voting Members": len(can_vote),
+                            "Active Members": len(active_list)}
     # freshman shit
     if ldap_is_intromember(user_name):
         data['freshman'] = get_freshman_data(user_name)

conditional/blueprints/intro_evals.py

@@ -107,8 +107,9 @@ def get_fid_cm_count(member_id):
 
         if freshman_data is None:
             continue
+        elif freshman_data.freshman_eval_result != "Pending":
+            continue
 
-        # Add continue for if freshman_data.status != Pending
         h_meetings = [m.meeting_id for m in
                       MemberHouseMeetingAttendance.query.filter(
                           MemberHouseMeetingAttendance.uid == uid

conditional/blueprints/member_management.py

@@ -3,10 +3,11 @@
 import uuid
 
 from datetime import datetime
+from functools import lru_cache
 
 import structlog
 
-from flask import Blueprint, request, jsonify
+from flask import Blueprint, request, jsonify, abort
 
 from conditional.models.models import FreshmanAccount
 from conditional.models.models import FreshmanEvalData
@@ -23,6 +24,7 @@
 
 from conditional.blueprints.cache_management import clear_active_members_cache
 from conditional.blueprints.cache_management import clear_onfloor_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_financial_director
@@ -37,8 +39,9 @@
 from conditional.util.ldap import ldap_get_name
 from conditional.util.ldap import ldap_is_active
 from conditional.util.ldap import ldap_is_onfloor
-from conditional.util.ldap import __ldap_add_member_to_group__ as ldap_add_member_to_group
-from conditional.util.ldap import __ldap_remove_member_from_group__ as ldap_remove_member_from_group
+from conditional.util.ldap import _ldap_add_member_to_group as ldap_add_member_to_group
+from conditional.util.ldap import _ldap_remove_member_from_group as ldap_remove_member_from_group
+from conditional.util.ldap import _ldap_is_member_of_group as ldap_is_member_of_group
 
 from conditional.util.flask import render_template
 from conditional.models.models import attendance_enum
@@ -50,7 +53,9 @@
 member_management_bp = Blueprint('member_management_bp', __name__)
 
 
-def get_members_info(members):
+@lru_cache(maxsize=1024)
+def get_members_info():
+    members = [m['uid'] for m in ldap_get_current_students()]
     member_list = []
     number_onfloor = 0
 
@@ -88,8 +93,7 @@ def display_member_management():
     if not ldap_is_eval_director(user_name) and not ldap_is_financial_director(user_name):
         return "must be eval director", 403
 
-    members = [m['uid'] for m in ldap_get_current_students()]
-    member_list, onfloor_number = get_members_info(members)
+    member_list, onfloor_number = get_members_info()
 
     freshmen = FreshmanAccount.query
     freshmen_list = []
@@ -238,6 +242,7 @@ def member_management_edituser(uid):
     db.session.commit()
     return jsonify({"success": True}), 200
 
+
 def edit_uid(uid, user_name, post_data):
     active_member = post_data['activeMember']
 
@@ -251,15 +256,18 @@ def edit_uid(uid, user_name, post_data):
 
         ldap_set_roomnumber(uid, room_number)
         if onfloor_status:
-            db.session.add(OnFloorStatusAssigned(uid, datetime.now()))
-            ldap_add_member_to_group(uid, "onfloor")
+            # If a OnFloorStatusAssigned object exists, don't make another
+            if not ldap_is_member_of_group(uid, "onfloor"):
+                db.session.add(OnFloorStatusAssigned(uid, datetime.now()))
+                ldap_add_member_to_group(uid, "onfloor")
         else:
             for ofs in OnFloorStatusAssigned.query.filter(OnFloorStatusAssigned.uid == uid):
                 db.session.delete(ofs)
             db.session.flush()
             db.session.commit()
 
-            ldap_remove_member_from_group(uid, "onfloor")
+            if ldap_is_member_of_group(uid, "onfloor"):
+                ldap_remove_member_from_group(uid, "onfloor")
         ldap_set_housingpoints(uid, housing_points)
 
     # Only update if there's a diff
@@ -284,8 +292,8 @@ def edit_uid(uid, user_name, post_data):
 
 def edit_fid(uid, post_data):
     logger.info('backend', action="edit freshman account %s room: %s onfloor: %s eval_date: %s sig_missed %s" %
-        (uid, post_data['roomNumber'], post_data['onfloorStatus'],
-        post_data['evalDate'], post_data['sigMissed']))
+                                  (uid, post_data['roomNumber'], post_data['onfloorStatus'],
+                                   post_data['evalDate'], post_data['sigMissed']))
 
     name = post_data['name']
 
@@ -458,18 +466,22 @@ def member_management_upgrade_user():
     db.session.add(new_acct)
     for fca in FreshmanCommitteeAttendance.query.filter(FreshmanCommitteeAttendance.fid == fid):
         db.session.add(MemberCommitteeAttendance(uid, fca.meeting_id))
-        # XXX this might fail horribly #yoloswag
         db.session.delete(fca)
 
     for fts in FreshmanSeminarAttendance.query.filter(FreshmanSeminarAttendance.fid == fid):
         db.session.add(MemberSeminarAttendance(uid, fts.seminar_id))
-        # XXX this might fail horribly #yoloswag
         db.session.delete(fts)
 
     for fhm in FreshmanHouseMeetingAttendance.query.filter(FreshmanHouseMeetingAttendance.fid == fid):
-        db.session.add(MemberHouseMeetingAttendance(
-            uid, fhm.meeting_id, fhm.excuse, fhm.attendance_status))
-        # XXX this might fail horribly #yoloswag
+        # Don't duplicate HM attendance records
+        mhm = MemberHouseMeetingAttendance.query.filter(
+            MemberHouseMeetingAttendance.meeting_id == fhm.meeting_id).first()
+        if mhm is None:
+            db.session.add(MemberHouseMeetingAttendance(
+                uid, fhm.meeting_id, fhm.excuse, fhm.attendance_status))
+        else:
+            logger.info('backend', action="duplicate house meeting attendance! fid: %s, uid: %s, id: %s" %
+                                          (fid, uid, fhm.meeting_id))
         db.session.delete(fhm)
 
     if acct.onfloor_status:
@@ -478,7 +490,6 @@ def member_management_upgrade_user():
     if acct.room_number:
         ldap_set_roomnumber(uid, acct.room_number)
 
-    # XXX this might fail horribly #yoloswag
     db.session.delete(acct)
 
     db.session.flush()
@@ -487,3 +498,58 @@ def member_management_upgrade_user():
     clear_onfloor_members_cache()
 
     return jsonify({"success": True}), 200
+
+
+@member_management_bp.route('/manage/intro_project', methods=['GET'])
+def introductory_project():
+    log = logger.new(user_name=request.headers.get("x-webauth-user"),
+                     request_id=str(uuid.uuid4()))
+    log.info('api', action='show introductory project management')
+
+    user_name = request.headers.get('x-webauth-user')
+
+    if not ldap_is_eval_director(user_name):
+        return "must be eval director", 403
+
+    return render_template(request,
+                           'introductory_project.html',
+                           username=user_name,
+                           intro_members=display_intro_evals(internal=True))
+
+
+@member_management_bp.route('/manage/intro_project', methods=['POST'])
+def introductory_project_submit():
+    log = logger.new(user_name=request.headers.get("x-webauth-user"),
+                     request_id=str(uuid.uuid4()))
+    log.info('api', action='submit introductory project results')
+
+    user_name = request.headers.get('x-webauth-user')
+
+    if not ldap_is_eval_director(user_name):
+        return "must be eval director", 403
+
+    post_data = request.get_json()
+
+    if not isinstance(post_data, list):
+        abort(400)
+
+    for intro_member in post_data:
+        if not isinstance(intro_member, dict):
+            abort(400)
+
+        if 'uid' not in intro_member or 'status' not in intro_member:
+            abort(400)
+
+        if intro_member['status'] not in ['Passed', 'Pending', 'Failed']:
+            abort(400)
+
+        log.info('debug', action='setting status "' + intro_member['status'] + '" for ' + intro_member['uid'])
+
+        FreshmanEvalData.query.filter(FreshmanEvalData.uid == intro_member['uid']).update({
+            'freshman_project': intro_member['status']
+        })
+
+    db.session.flush()
+    db.session.commit()
+
+    return jsonify({"success": True}), 200

conditional/blueprints/slideshow.py

@@ -127,7 +127,7 @@ def slideshow_spring_review():
     post_data = request.get_json()
     uid = post_data['uid']
     status = post_data['status']
-    # points = post_data['points']
+
     logger.info("backend", action="submit spring eval for %s status: %s" % (uid, status))
 
     SpringEval.query.filter(
@@ -138,18 +138,6 @@ def slideshow_spring_review():
             'status': status
         })
 
-    # points are handeled automagically through constitutional override
-    # HousingEvalsSubmission.query.filter(
-    #    HousingEvalsSubmission.uid == uid and
-    #    HousingEvalsSubmission.active).\
-    #    update(
-    #        {
-    #            'points': points
-    #        })
-
-    # current_points = ldap_get_housing_points(uid)
-    # ldap_set_housingpoints(uid, current_points + points)
-
     db.session.flush()
     db.session.commit()
     return jsonify({"success": True}), 200

conditional/blueprints/spring_evals.py

@@ -11,7 +11,6 @@
 from conditional.models.models import MajorProject
 from conditional.models.models import HouseMeeting
 from conditional.models.models import SpringEval
-from conditional.models.models import HousingEvalsSubmission
 
 from conditional.util.flask import render_template
 
@@ -53,22 +52,11 @@ def get_cm_count(member_id):
             db.session.commit()
             # something bad happened to get here
             print("User did not have existing spring eval data")
+        elif spring_entry.status != "Pending":
+            continue
 
         eval_data = None
-        if internal:
-            eval_data = HousingEvalsSubmission.query.filter(
-                HousingEvalsSubmission.uid == uid).first()
 
-            if HousingEvalsSubmission.query.filter(HousingEvalsSubmission.uid == uid).count() > 0:
-                eval_data = \
-                    {
-                        'social_attended': eval_data.social_attended,
-                        'social_hosted': eval_data.social_hosted,
-                        'seminars_attended': eval_data.technical_attended,
-                        'seminars_hosted': eval_data.technical_hosted,
-                        'projects': eval_data.projects,
-                        'comments': eval_data.comments
-                    }
         h_meetings = [m.meeting_id for m in
                       MemberHouseMeetingAttendance.query.filter(
                           MemberHouseMeetingAttendance.uid == uid