Merge pull request #138 from mbillow/co-op

Co-Op Submission Page

Author: mbillow

conditional/__init__.py

@@ -50,6 +50,7 @@ def start_of_year():
 from conditional.blueprints.member_management import member_management_bp
 from conditional.blueprints.slideshow import slideshow_bp
 from conditional.blueprints.cache_management import cache_bp
+from conditional.blueprints.co_op import co_op_bp
 
 app.register_blueprint(dashboard_bp)
 app.register_blueprint(attendance_bp)
@@ -62,6 +63,7 @@ def start_of_year():
 app.register_blueprint(member_management_bp)
 app.register_blueprint(slideshow_bp)
 app.register_blueprint(cache_bp)
+app.register_blueprint(co_op_bp)
 
 from conditional.util.ldap import ldap_get_member
 

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

@@ -0,0 +1,77 @@
+import uuid
+import structlog
+
+from flask import Blueprint, request, jsonify
+
+from conditional.util.flask import render_template
+
+from conditional.util.ldap import ldap_get_member, ldap_is_eval_director
+
+from conditional.models.models import CurrentCoops
+
+from conditional import db, start_of_year
+
+co_op_bp = Blueprint('co_op_bp', __name__)
+
+logger = structlog.get_logger()
+
+@co_op_bp.route('/co_op/')
+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 co-op submission 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()
+
+    return render_template(request,
+                           'co_op.html',
+                           username=user_name,
+                           year=start_of_year().year,
+                           on_coop=co_op)
+
+
+@co_op_bp.route('/co_op/submit', methods=['POST'])
+def submit_co_op_form():
+    log = logger.new(user_name=request.headers.get("x-webauth-user"),
+                     request_id=str(uuid.uuid4()))
+
+    user_name = request.headers.get('x-webauth-user')
+
+    post_data = request.get_json()
+    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
+
+
+@co_op_bp.route('/co_op/<uid>', methods=['DELETE'])
+def delete_co_op(uid):
+    log = logger.new(user_name=request.headers.get("x-webauth-user"),
+                     request_id=str(uuid.uuid4()))
+
+    username = request.headers.get('x-webauth-user')
+    account = ldap_get_member(username)
+
+    if not ldap_is_eval_director(account):
+        return "must be eval director", 403
+
+    log.info('api', action="Delete %s's Co-Op" % uid)
+
+    CurrentCoops.query.filter(CurrentCoops.uid == uid, CurrentCoops.date_created > start_of_year()).delete()
+
+    db.session.flush()
+    db.session.commit()
+
+    return jsonify({"success": True}), 200

conditional/blueprints/member_management.py

@@ -20,6 +20,7 @@
 from conditional.models.models import EvalSettings
 from conditional.models.models import OnFloorStatusAssigned
 from conditional.models.models import SpringEval
+from conditional.models.models import CurrentCoops
 
 from conditional.blueprints.cache_management import clear_members_cache
 from conditional.blueprints.intro_evals import display_intro_evals
@@ -42,7 +43,7 @@
 from conditional.models.models import attendance_enum
 from conditional.util.member import get_members_info, get_onfloor_members
 
-from conditional import db
+from conditional import db, start_of_year
 
 logger = structlog.get_logger()
 
@@ -64,6 +65,11 @@ def display_member_management():
     member_list = get_members_info()
     onfloor_list = get_onfloor_members()
 
+    co_op_list = [(ldap_get_member(member.uid).displayName, member.semester, member.uid) \
+        for member in CurrentCoops.query.filter(
+            CurrentCoops.date_created > start_of_year(),
+            CurrentCoops.semester != "Neither")]
+
     freshmen = FreshmanAccount.query
     freshmen_list = []
 
@@ -92,6 +98,7 @@ def display_member_management():
                            num_fresh=len(freshmen_list),
                            num_onfloor=len(onfloor_list),
                            freshmen=freshmen_list,
+                           co_op=co_op_list,
                            site_lockdown=lockdown,
                            intro_form=intro_form)
 

conditional/models/models.py

@@ -191,13 +191,14 @@ class CurrentCoops(db.Model):
     __tablename__ = 'current_coops'
     id = Column(Integer, primary_key=True)
     uid = Column(String(32), nullable=False)
-    active = Column(Boolean, nullable=False)
     date_created = Column(Date, nullable=False)
+    semester = Column(Enum('Fall', 'Spring', name="co_op_enum"), nullable=False)
 
-    def __init__(self, uid):
+    def __init__(self, uid, semester):
         self.uid = uid
         self.active = True
         self.date_created = datetime.now()
+        self.semester = semester
 
 
 class OnFloorStatusAssigned(db.Model):

conditional/templates/co_op.html

@@ -0,0 +1,51 @@
+{% extends "nav.html" %}
+{% block title %}
+Co-Op Submission
+{% endblock %}
+{% block body %}
+<div class="container main">
+    <h3 class="page-title">Co-Op Submission</h3>
+    <div class="row">
+        <div class="col-xs-12 col-sm-12 col-md-12">
+            <div class="panel panel-default">
+                <div class="panel-body" style="padding-top:25px">
+                    {% if not on_coop %}
+                    <p>Please select one of the following options below if you are going to be on co-op during either semester this year. In the case you are going to be on co-op for both semesters, please contact the Evaluations Director and have them remove you from Active status.</p>
+                    <p>By selecting an option and submitting this form you are forfeiting your right to vote in house matters during the selected period. You are not required to attend house meetings but are still eligable for directorship meeting attendance.</p>
+                    <form data-module="coopSubmitForm">
+                        <div class="co-op-group">
+                            <div class="col-xs-12 col-sm-6">
+                                <div class="radio co-op-radio">
+                                    <label>
+                                        <input type="radio" name="semester" id="fall" value="Fall">
+                                        <div class="co-op-option">
+                                        <h4 class="list-group-item-heading">Fall Semester</h4>
+                                        <p class='co-op-description'>August - December {{year}}</p>
+                                        </div>
+                                    </label>
+                                </div>
+                            </div>
+                            <div class="col-xs-12 col-sm-6">
+                                <div class="radio co-op-radio">
+                                    <label>
+                                        <input type="radio" name="semester" id="spring" value="Spring">
+                                        <div class="co-op-option">
+                                        <h4 class="list-group-item-heading">Spring Semester</h4>
+                                        <p class='co-op-description'>January - May {{year + 1}}</p>
+                                        </div>
+                                    </label>
+                                </div>
+                            </div>
+                        </div>
+                        <input type="submit" role="button" class="btn btn-raised btn-primary" style="width:100%;" value="Submit Form"/>
+                    </form>
+                    {% else %}
+                    <p class="align-center">Thank you for submitting this form. Good luck on your {{on_coop.semester}} co-op!</p>
+                    <p class="align-center">If you submitted this form by mistake or your plans have changed, please contact the Evaluations Director.</p>
+                    {% endif %}
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+{% endblock %}

conditional/templates/member_management.html

@@ -38,6 +38,43 @@ <h3 class="panel-title">Administration</h3>
             </div>
         </div>
     </div>
+    {% if co_op and is_eval_director%}
+       <div class="panel panel-default">
+        <div class="panel-heading">
+            <h3 class="panel-title">Co-Op Management</h3>
+        </div>
+        <div class="panel-body table-fill">
+            <div class="table-responsive">
+                <table class="table table-striped no-bottom-margin" data-module="table" data-searchable="false" data-sort-column="1" data-sort-order="asc" data-length-changable="true" data-paginated="false">
+                    <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Semester</th>
+                        <th>Delete</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    {% for c in co_op %}
+                    <tr id="coop-{{c[2]}}">
+                        <td>
+                            <img class="table-img mobile-hide" src="https://profiles.csh.rit.edu/image/{{c[2]}}"> {{c[0]}}
+                        </td>
+                        <td>
+                            {{c[1]}}
+                        </td>
+                        <td width=100px>
+                            <a href="#" data-module="coopDelete" data-uid="{{c[2]}}">
+                                <span class="glyphicon glyphicon-trash red align-center" style="width: 100%"></span>
+                            </a>
+                        </td>
+                    </tr>
+                    {% endfor %}
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+    {% endif %}
 
     {% if is_eval_director %}
     <div class="panel panel-default">

conditional/templates/nav.html

@@ -25,6 +25,7 @@
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="glyphicon glyphicon-list-alt"></span> Forms <span class="caret"></span></a>
                     <ul class="dropdown-menu">
                         <li><a href="/major_project"><span class="glyphicon glyphicon-star"></span> Major Project</a></li>
+                        <li><a href="/co_op"><span class="glyphicon glyphicon-briefcase"></span> Co-Op Submission</a></li>
                         {% if is_intromember %}
                         <li><a href="/intro_evals_form"><span class="glyphicon glyphicon-blackboard"></span> Introductory Evaluations</a></li>
                         {% endif %}
@@ -40,7 +41,7 @@
                     {% endif %}
                     <span class="caret"></span></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/attendance_cm"><span class="glyphicon glyphicon-briefcase"></span> Directorship Meeting </a></li>
+                        <li><a href="/attendance_cm"><span class="glyphicon glyphicon-user"></span> Directorship Meeting </a></li>
                         <li><a href="/attendance_ts"><span class="glyphicon glyphicon-blackboard"></span> Technical Seminar</a></li>
                         {% if is_eboard %}
                         <li><a href="/attendance/history"><span class="glyphicon glyphicon-calendar"></span> Attendance History</a></li>

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,34 @@
 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():
-    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 datetime.today() < datetime(start_of_year().year, 12, 31):
+        semester = 'Fall'
+    else:
+        semester = 'Spring'
+
+    active_members = set(member.uid for member in ldap_get_active_members())
+    intro_members = set(member.uid for member in ldap_get_intro_members())
+    on_coop = set(member.uid for member in CurrentCoops.query.filter(
+        CurrentCoops.date_created > start_of_year(),
+        CurrentCoops.semester == semester).all())
+
+    voting_list = list(active_members - intro_members - on_coop)
 
     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
 

frontend/javascript/modules/coopDelete.js

@@ -0,0 +1,27 @@
+import FetchUtil from "../utils/fetchUtil";
+
+export default class coopDelete {
+  constructor(link) {
+    this.link = link;
+    this.uid = this.link.dataset.uid;
+    this.endpoint = '/co_op/' + this.uid;
+    this.render();
+  }
+
+  render() {
+    this.link.addEventListener('click', e => this._delete(e));
+  }
+
+  _delete(e) {
+    e.preventDefault();
+
+    FetchUtil.fetchWithWarning(this.endpoint, {
+      method: 'DELETE',
+      warningText: "This co-op entry will be deleted and the user will no" +
+      " longer be excluded from attendance and vote counts.",
+      successText: "Co-op has been deleted."
+    }, () => {
+      document.getElementById('coop-' + this.uid).remove();
+    });
+  }
+}