Merge pull request #75 from ComputerScienceHouse/develop

Conditional 1.1.0

Author: mbillow

.gitignore

@@ -56,7 +56,7 @@ docs/_build/
 # PyBuilder
 target/
 
-#Ipython Notebook
+# Ipython Notebook
 .ipynb_checkpoints
 
 # JetBrains IDEs
@@ -78,3 +78,6 @@ target/
 
 # Built frontend files
 /conditional/static/*
+
+# virtualenv
+/.conditionalenv

.pylintrc

@@ -82,7 +82,7 @@ max-args = 10
 ignored-argument-names = _.*
 max-locals = 20
 max-returns = 6
-max-branches = 13
+max-branches = 15
 max-statements = 55
 max-parents = 7
 max-attributes = 10

conditional/blueprints/attendance.py

@@ -146,7 +146,7 @@ def display_attendance_cm():
     return render_template(request,
                            'attendance_cm.html',
                            username=user_name,
-                           date=datetime.utcnow().strftime("%Y-%m-%d"))
+                           date=datetime.now().strftime("%Y-%m-%d"))
 
 
 @attendance_bp.route('/attendance_ts')
@@ -162,7 +162,7 @@ def display_attendance_ts():
     return render_template(request,
                            'attendance_ts.html',
                            username=user_name,
-                           date=datetime.utcnow().strftime("%Y-%m-%d"))
+                           date=datetime.now().strftime("%Y-%m-%d"))
 
 
 @attendance_bp.route('/attendance_hm')
@@ -178,7 +178,7 @@ def display_attendance_hm():
     return render_template(request,
                            'attendance_hm.html',
                            username=user_name,
-                           date=datetime.utcnow().strftime("%Y-%m-%d"),
+                           date=datetime.now().strftime("%Y-%m-%d"),
                            members=get_non_alumni_non_coop(internal=True))
 
 

conditional/blueprints/conditional.py

@@ -61,7 +61,7 @@ def create_conditional():
 
     uid = post_data['uid']
     description = post_data['description']
-    due_date = datetime.strptime(post_data['due_date'], "%Y-%m-%d")
+    due_date = datetime.strptime(post_data['dueDate'], "%Y-%m-%d")
 
     db.session.add(Conditional(uid, description, due_date))
     db.session.flush()
@@ -97,3 +97,21 @@ def conditional_review():
     db.session.flush()
     db.session.commit()
     return jsonify({"success": True}), 200
+
+
+@conditionals_bp.route('/conditionals/delete/<cid>', methods=['DELETE'])
+def conditional_delete(cid):
+    log = logger.new(user_name=request.headers.get("x-webauth-user"),
+                     request_id=str(uuid.uuid4()))
+    log.info('api', action='delete conditional')
+
+    user_name = request.headers.get('x-webauth-user')
+    if ldap_is_eval_director(user_name):
+        Conditional.query.filter(
+            Conditional.id == cid
+        ).delete()
+        db.session.flush()
+        db.session.commit()
+        return jsonify({"success": True}), 200
+    else:
+        return "Must be evals director to delete!", 401

conditional/blueprints/dashboard.py

@@ -96,7 +96,6 @@ 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)
@@ -142,6 +141,7 @@ def display_dashboard():
 
     data['major_projects'] = [
         {
+            'id': p.id,
             'name': p.name,
             'status': p.status,
             'description': p.description
@@ -173,7 +173,7 @@ def display_dashboard():
     cm_attendance = [
         {
             'type': m.committee,
-            'datetime': m.timestamp
+            'datetime': m.timestamp.date()
         } for m in CommitteeMeeting.query.filter(
             CommitteeMeeting.id.in_(c_meetings)
         )]

conditional/blueprints/major_project_submission.py

@@ -34,7 +34,8 @@ def display_major_project():
             'proj_name': p.name,
             'status': p.status,
             'description': p.description,
-            'id': p.id
+            'id': p.id,
+            'is_owner': bool(user_name == p.uid)
         } for p in
         MajorProject.query]
 
@@ -95,3 +96,27 @@ def major_project_review():
     db.session.flush()
     db.session.commit()
     return jsonify({"success": True}), 200
+
+
+@major_project_bp.route('/major_project/delete/<pid>', methods=['DELETE'])
+def major_project_delete(pid):
+    log = logger.new(user_name=request.headers.get("x-webauth-user"),
+                     request_id=str(uuid.uuid4()))
+    log.info('api', action='review major project')
+
+    # get user data
+    user_name = request.headers.get('x-webauth-user')
+    major_project = MajorProject.query.filter(
+        MajorProject.id == pid
+    ).first()
+    creator = major_project.uid
+
+    if creator == user_name or ldap_is_eval_director(user_name):
+        MajorProject.query.filter(
+            MajorProject.id == pid
+        ).delete()
+        db.session.flush()
+        db.session.commit()
+        return jsonify({"success": True}), 200
+    else:
+        return "Must be project owner to delete!", 401

conditional/blueprints/member_management.py

@@ -230,67 +230,85 @@ def member_management_edituser(uid):
     post_data = request.get_json()
 
     if not uid.isdigit():
-        active_member = post_data['activeMember']
-
-        if ldap_is_eval_director(user_name):
-            logger.info('backend', action="edit %s room: %s onfloor: %s housepts %s" %
-                                          (uid, post_data['roomNumber'], post_data['onfloorStatus'],
-                                           post_data['housingPoints']))
-            room_number = post_data['roomNumber']
-            onfloor_status = post_data['onfloorStatus']
-            housing_points = post_data['housingPoints']
-
-            ldap_set_roomnumber(uid, room_number)
-            if onfloor_status:
-                ldap_add_member_to_group(uid, "onfloor")
-            else:
-                ldap_remove_member_from_group(uid, "onfloor")
-            ldap_set_housingpoints(uid, housing_points)
-
-        # Only update if there's a diff
-        logger.info('backend', action="edit %s active: %s" % (uid, active_member))
-        if ldap_is_active(uid) != active_member:
-            if active_member:
-                ldap_set_active(uid)
-            else:
-                ldap_set_inactive(uid)
-
-            if active_member:
-                db.session.add(SpringEval(uid))
-            else:
-                SpringEval.query.filter(
-                    SpringEval.uid == uid and
-                    SpringEval.active).update(
-                    {
-                        'active': False
-                    })
-            clear_active_members_cache()
+        edit_uid(uid, user_name, post_data)
     else:
-        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']))
+        edit_fid(uid, post_data)
+
+    db.session.flush()
+    db.session.commit()
+    return jsonify({"success": True}), 200
+
+def edit_uid(uid, user_name, post_data):
+    active_member = post_data['activeMember']
 
-        name = post_data['name']
+    if ldap_is_eval_director(user_name):
+        logger.info('backend', action="edit %s room: %s onfloor: %s housepts %s" %
+                                      (uid, post_data['roomNumber'], post_data['onfloorStatus'],
+                                       post_data['housingPoints']))
         room_number = post_data['roomNumber']
         onfloor_status = post_data['onfloorStatus']
-        eval_date = post_data['evalDate']
+        housing_points = post_data['housingPoints']
 
-        if post_data['sigMissed'] == "":
-            sig_missed = None
+        ldap_set_roomnumber(uid, room_number)
+        if onfloor_status:
+            db.session.add(OnFloorStatusAssigned(uid, datetime.now()))
+            ldap_add_member_to_group(uid, "onfloor")
         else:
-            sig_missed = post_data['sigMissed']
-
-        FreshmanAccount.query.filter(FreshmanAccount.id == uid).update({
-            'name': name,
-            'eval_date': datetime.strptime(eval_date, "%Y-%m-%d"),
-            'onfloor_status': onfloor_status,
-            'room_number': room_number,
-            'signatures_missed': sig_missed
-        })
+            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")
+        ldap_set_housingpoints(uid, housing_points)
+
+    # Only update if there's a diff
+    logger.info('backend', action="edit %s active: %s" % (uid, active_member))
+    if ldap_is_active(uid) != active_member:
+        if active_member:
+            ldap_set_active(uid)
+        else:
+            ldap_set_inactive(uid)
 
-    db.session.flush()
-    db.session.commit()
-    return jsonify({"success": True}), 200
+        if active_member:
+            db.session.add(SpringEval(uid))
+        else:
+            SpringEval.query.filter(
+                SpringEval.uid == uid and
+                SpringEval.active).update(
+                {
+                    'active': False
+                })
+        clear_active_members_cache()
+
+
+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']))
+
+    name = post_data['name']
+
+    if post_data['roomNumber'] == "":
+        room_number = None
+    else:
+        room_number = post_data['roomNumber']
+
+    onfloor_status = post_data['onfloorStatus']
+    eval_date = post_data['evalDate']
+
+    if post_data['sigMissed'] == "":
+        sig_missed = None
+    else:
+        sig_missed = post_data['sigMissed']
+
+    FreshmanAccount.query.filter(FreshmanAccount.id == uid).update({
+        'name': name,
+        'eval_date': datetime.strptime(eval_date, "%Y-%m-%d"),
+        'onfloor_status': onfloor_status,
+        'room_number': room_number,
+        'signatures_missed': sig_missed
+    })
 
 
 @member_management_bp.route('/manage/user/<uid>', methods=['GET'])

conditional/blueprints/slideshow.py

@@ -37,7 +37,7 @@ def slideshow_intro_display():
     return render_template(request,
                            'intro_eval_slideshow.html',
                            username=user_name,
-                           date=datetime.utcnow().strftime("%Y-%m-%d"),
+                           date=datetime.now().strftime("%Y-%m-%d"),
                            members=display_intro_evals(internal=True))
 
 
@@ -96,7 +96,7 @@ def slideshow_spring_display():
     return render_template(request,
                            'spring_eval_slideshow.html',
                            username=user_name,
-                           date=datetime.utcnow().strftime("%Y-%m-%d"),
+                           date=datetime.now().strftime("%Y-%m-%d"),
                            members=display_spring_evals(internal=True))
 
 

conditional/models/migrate.py

@@ -307,7 +307,7 @@ def migrate_models():
     from datetime import datetime
     members = [m['uid'][0].decode('utf-8') for m in ldap.ldap_get_onfloor_members()]
     for m in members:
-        db.session.add(models.OnFloorStatusAssigned(m, datetime.utcnow()))
+        db.session.add(models.OnFloorStatusAssigned(m, datetime.now()))
     print("END: ON FLOOR")
 
     print("BEGIN: SPRING EVALS")

conditional/models/models.py

@@ -220,7 +220,7 @@ def __init__(self, uid, description, due):
         self.uid = uid
         self.description = description
         self.date_due = due
-        self.date_created = datetime.utcnow()
+        self.date_created = datetime.now()
         self.status = "Pending"
         self.active = True