From 176d31a48c9daa22ddf9ca0bc987da2f1ce970b9 Mon Sep 17 00:00:00 2001 From: Devin Matte Date: Tue, 18 Aug 2020 17:42:28 -0400 Subject: [PATCH 1/5] Initial Admin UI --- .gitignore | 3 + packet/__init__.py | 1 + packet/context_processors.py | 4 +- packet/ldap.py | 8 ++ packet/models.py | 7 ++ packet/routes/admin.py | 37 +++++++++ packet/routes/api.py | 2 + packet/routes/shared.py | 2 +- packet/static/js/admin.js | 79 +++++++++++++++++++ packet/templates/admin.html | 37 +++++++++ .../templates/include/admin/all_freshmen.html | 33 ++++++++ .../templates/include/admin/new_packets.html | 23 ++++++ .../templates/include/admin/open_packets.html | 39 +++++++++ packet/templates/include/nav.html | 3 + packet/utils.py | 21 ++++- 15 files changed, 295 insertions(+), 4 deletions(-) create mode 100644 packet/routes/admin.py create mode 100644 packet/static/js/admin.js create mode 100644 packet/templates/admin.html create mode 100644 packet/templates/include/admin/all_freshmen.html create mode 100644 packet/templates/include/admin/new_packets.html create mode 100644 packet/templates/include/admin/open_packets.html diff --git a/.gitignore b/.gitignore index 2dde3669..fda07a3b 100644 --- a/.gitignore +++ b/.gitignore @@ -103,6 +103,9 @@ ENV/ # JetBrains .idea/ +# vscode +.vscode + # Configurations config.py diff --git a/packet/__init__.py b/packet/__init__.py index c369efdc..32e9fe74 100644 --- a/packet/__init__.py +++ b/packet/__init__.py @@ -80,6 +80,7 @@ if app.config['REALM'] == 'csh': from .routes import upperclassmen + from .routes import admin else: from .routes import freshmen diff --git a/packet/context_processors.py b/packet/context_processors.py index 604d931b..935106b6 100644 --- a/packet/context_processors.py +++ b/packet/context_processors.py @@ -43,7 +43,7 @@ def get_roles(sig): # pylint: disable=bare-except -@lru_cache(maxsize=128) +@lru_cache(maxsize=256) def get_rit_name(username): try: freshman = Freshman.query.filter_by(rit_username=username).first() @@ -53,7 +53,7 @@ def get_rit_name(username): # pylint: disable=bare-except -@lru_cache(maxsize=128) +@lru_cache(maxsize=256) def get_rit_image(username): if username: addresses = [username + '@rit.edu', username + '@g.rit.edu'] diff --git a/packet/ldap.py b/packet/ldap.py index 30b2f285..1b7de82c 100644 --- a/packet/ldap.py +++ b/packet/ldap.py @@ -158,6 +158,14 @@ def ldap_is_eboard(member): return _ldap_is_member_of_group(member, 'eboard') +def ldap_is_evals(member): + return _ldap_is_member_of_group(member, 'eboard-evaluations') + + +def ldap_is_rtp(member): + return _ldap_is_member_of_group(member, 'rtp') + + def ldap_is_intromember(member): """ :param member: A CSHMember instance diff --git a/packet/models.py b/packet/models.py index 6f8cbb6d..355a9976 100644 --- a/packet/models.py +++ b/packet/models.py @@ -49,6 +49,13 @@ def by_username(cls, username: str): """ return cls.query.filter_by(rit_username=username).first() + @classmethod + def get_all(cls): + """ + Helper method to get all freshmen easily + """ + return cls.query.all() + class Packet(db.Model): __tablename__ = 'packet' diff --git a/packet/routes/admin.py b/packet/routes/admin.py new file mode 100644 index 00000000..5db63b36 --- /dev/null +++ b/packet/routes/admin.py @@ -0,0 +1,37 @@ +import csv +import os + +import requests +from flask import render_template, redirect, request +from werkzeug.utils import secure_filename + +from packet import app +from packet.models import Packet, Freshman +from packet.routes.shared import packet_sort_key +from packet.utils import before_request, packet_auth, admin_auth +from packet.log_utils import log_cache, log_time + + +@app.route('/admin/') +@log_cache +@packet_auth +@admin_auth +@before_request +@log_time +def admin(info=None): + open_packets = Packet.open_packets() + + # Pre-calculate and store the return values of did_sign(), signatures_received(), and signatures_required() + for packet in open_packets: + packet.did_sign_result = packet.did_sign(info['uid'], app.config['REALM'] == 'csh') + packet.signatures_received_result = packet.signatures_received() + packet.signatures_required_result = packet.signatures_required() + + open_packets.sort(key=packet_sort_key, reverse=True) + + all_freshmen = Freshman.get_all() + + return render_template('admin.html', + open_packets=open_packets, + all_freshmen=all_freshmen, + info=info) diff --git a/packet/routes/api.py b/packet/routes/api.py index f3d2f0f0..c369835a 100644 --- a/packet/routes/api.py +++ b/packet/routes/api.py @@ -12,6 +12,7 @@ from packet.ldap import ldap_get_eboard_role, ldap_get_active_rtps, ldap_get_3das, ldap_get_webmasters, \ ldap_get_drink_admins, ldap_get_constitutional_maintainers, ldap_is_intromember, ldap_get_active_members, \ ldap_is_on_coop, _ldap_is_member_of_group, ldap_get_member +from packet.log_utils import log_time from packet.mail import send_report_mail, send_start_packet_mail from packet.utils import before_request, packet_auth, notify_slack from packet.models import Packet, MiscSignature, NotificationSubscription, Freshman, FreshSignature, UpperSignature @@ -80,6 +81,7 @@ def sync_freshman(): @app.route('/api/v1/packets', methods=['POST']) @packet_auth +@log_time def create_packet(): """ Create a new packet. diff --git a/packet/routes/shared.py b/packet/routes/shared.py index 97241815..5b872786 100644 --- a/packet/routes/shared.py +++ b/packet/routes/shared.py @@ -13,7 +13,7 @@ @app.route('/logout/') @auth.oidc_logout def logout(): - return redirect('http://csh.rit.edu') + return redirect('https://csh.rit.edu') @app.route('/packet//') diff --git a/packet/static/js/admin.js b/packet/static/js/admin.js new file mode 100644 index 00000000..f279f0c7 --- /dev/null +++ b/packet/static/js/admin.js @@ -0,0 +1,79 @@ +$(document).ready(function () { + + let openPacketsTable = $('#open_packets_table'); + openPacketsTable.DataTable({ + "searching": true, + "order": [], + "scrollX": false, + "paging": true, + "info": false, + "columnDefs": [ + { + "targets": 0, + "max-width": "50%", + }, + { + "type": "num-fmt", + "targets": 1, + "visible": true, + "max-width": "15%", + } + ] + }); + + let allFreshmenTable = $('#all_freshmen_table'); + allFreshmenTable.DataTable({ + "searching": true, + "order": [], + "scrollX": false, + "paging": true, + "info": false, + }); + + $("#create-packets").click(() => { + makePackets(); + }); + +}); + +let makePackets = () => { + let freshmen = []; + let fileUpload = document.getElementById("newPacketsFile"); + let regex = /^([a-zA-Z0-9\s_\\.\-:])+(.csv|.txt)$/; + if (regex.test(fileUpload.value.toLowerCase())) { + if (typeof (FileReader) != "undefined") { + let reader = new FileReader(); + reader.onload = (e) => { + let rows = e.target.result.split("\n"); + for (let i = 0; i < rows.length; i++) { + let cells = rows[i].split(","); + if (cells.length > 1) { + freshmen.push(cells[3]); + } + } + const payload = {start_date: $('#packet-start-date').val(), freshmen: freshmen} + if (freshmen.length >= 1) { + $("#create-packets").append(" "); + $("#create-packets").attr('disabled', true); + fetch('/api/v1/packets', + { + method: 'POST', + headers: { + 'Content-Type': 'application/json' + }, + body: JSON.stringify(payload) + } + ).then(response => { + if (response.status < 300) { + $('#new-packets-modal').modal('hide'); + location.reload(); + } else { + alert("There was an error creating packets") + } + }) + } + } + reader.readAsText(fileUpload.files[0]); + } + } +} diff --git a/packet/templates/admin.html b/packet/templates/admin.html new file mode 100644 index 00000000..d9c81abd --- /dev/null +++ b/packet/templates/admin.html @@ -0,0 +1,37 @@ +{% extends "extend/base.html" %} + +{% block body %} +
+
+
+
+

Active Packets

+
+
+ + {% include 'include/admin/new_packets.html' %} +
+
+
+
+ {% include 'include/admin/open_packets.html' %} +
+{#
#} +{#
#} +{#
#} +{#

All Freshmen

#} +{#
#} +{#
#} +{#
#} +{#
#} +{# {% include 'include/admin/all_freshmen.html' %}#} +{#
#} +
+{% endblock %} + +{% block scripts %} + {{ super() }} + +{% endblock %} diff --git a/packet/templates/include/admin/all_freshmen.html b/packet/templates/include/admin/all_freshmen.html new file mode 100644 index 00000000..a3e79e3b --- /dev/null +++ b/packet/templates/include/admin/all_freshmen.html @@ -0,0 +1,33 @@ +
+
+
+
+ + + + + + + + + {% for freshman in all_freshmen %} + {% set freshman_name = freshman.name + ' (' + freshman.rit_username + ')' %} + + + + + {% endfor %} + +
NameOn-Floor
+ {{ freshman_name }} {{ freshman_name }} + + {{ freshman.onfloor }} +
+
+
+
+
diff --git a/packet/templates/include/admin/new_packets.html b/packet/templates/include/admin/new_packets.html new file mode 100644 index 00000000..ba0667a2 --- /dev/null +++ b/packet/templates/include/admin/new_packets.html @@ -0,0 +1,23 @@ + diff --git a/packet/templates/include/admin/open_packets.html b/packet/templates/include/admin/open_packets.html new file mode 100644 index 00000000..275b622c --- /dev/null +++ b/packet/templates/include/admin/open_packets.html @@ -0,0 +1,39 @@ +
+
+
+
+ + + + + + + + + {% for packet in open_packets %} + + + + + {% endfor %} + +
NameSignatures
+ + {{ get_rit_name(packet.freshman_username) }} {{ get_rit_name(packet.freshman_username) }} + + + {% if packet.signatures_received_result.total == packet.signatures_required_result.total %} + 💯 {# 100% emoji #} + {% else %} + {{ packet.signatures_received_result.total }} / + {{ packet.signatures_required_result.total }} + {% endif %} +
+
+
+
+
diff --git a/packet/templates/include/nav.html b/packet/templates/include/nav.html index fb8f2a62..02a15e4c 100644 --- a/packet/templates/include/nav.html +++ b/packet/templates/include/nav.html @@ -18,6 +18,9 @@
  • Signatures
    • +
  • + Admin +
    • {% else %}
  • diff --git a/packet/utils.py b/packet/utils.py index 317ef369..5ffec074 100644 --- a/packet/utils.py +++ b/packet/utils.py @@ -9,7 +9,7 @@ from packet import auth, app from packet.models import Freshman -from packet.ldap import ldap_get_member, ldap_is_intromember +from packet.ldap import ldap_get_member, ldap_is_intromember, ldap_is_evals, ldap_is_rtp INTRO_REALM = 'https://sso.csh.rit.edu/auth/realms/intro' @@ -70,6 +70,25 @@ def wrapped_function(*args, **kwargs): return wrapped_function +def admin_auth(func): + """ + Decorator for easily configuring oidc + """ + @auth.oidc_auth('app') + @wraps(func) + def wrapped_function(*args, **kwargs): + if app.config['REALM'] == 'csh': + username = str(session['userinfo'].get('preferred_username', '')) + member = ldap_get_member(username) + if not ldap_is_evals(member) and not ldap_is_rtp(member): + app.logger.warn('Stopped member {} from accessing admin UI'.format(username)) + return redirect(app.config['PROTOCOL'] + app.config['PACKET_UPPER'], code=301) + + return func(*args, **kwargs) + + return wrapped_function + + def notify_slack(name: str): """ Sends a congratulate on sight decree to Slack From c94a2d57ea5c88a1655486cc75658c75c2020b89 Mon Sep 17 00:00:00 2001 From: Devin Matte Date: Tue, 18 Aug 2020 20:20:26 -0400 Subject: [PATCH 2/5] Adding sync command that works, and functioning admin pages --- .gitignore | 2 + packet/commands.py | 36 +---- packet/ldap.py | 2 +- packet/routes/admin.py | 26 ++-- packet/routes/api.py | 134 +++++++----------- packet/static/js/admin.js | 52 +++++++ packet/templates/admin_freshmen.html | 27 ++++ .../{admin.html => admin_packets.html} | 0 .../templates/include/admin/new_packets.html | 2 +- .../include/admin/sync_freshmen.html | 22 +++ packet/templates/include/nav.html | 15 +- packet/utils.py | 47 +++++- 12 files changed, 232 insertions(+), 133 deletions(-) create mode 100644 packet/templates/admin_freshmen.html rename packet/templates/{admin.html => admin_packets.html} (100%) create mode 100644 packet/templates/include/admin/sync_freshmen.html diff --git a/.gitignore b/.gitignore index fda07a3b..709237b0 100644 --- a/.gitignore +++ b/.gitignore @@ -131,3 +131,5 @@ packet/static/safari-pinned-tab.svg packet/static/site.webmanifest faviconData.json +# csvs +*.csv diff --git a/packet/commands.py b/packet/commands.py index d4654f7d..1d1f87d0 100644 --- a/packet/commands.py +++ b/packet/commands.py @@ -16,6 +16,7 @@ from .ldap import ldap_get_eboard_role, ldap_get_active_rtps, ldap_get_3das, ldap_get_webmasters, \ ldap_get_drink_admins, ldap_get_constitutional_maintainers, ldap_is_intromember, ldap_get_active_members, \ ldap_is_on_coop +from .utils import sync_freshman @app.cli.command('create-secret') @@ -66,40 +67,7 @@ def sync_freshmen(freshmen_csv): freshmen_in_csv = parse_csv(freshmen_csv) print('Syncing contents with the DB...') - freshmen_in_db = {freshman.rit_username: freshman for freshman in Freshman.query.all()} - - for csv_freshman in freshmen_in_csv.values(): - if csv_freshman.rit_username not in freshmen_in_db: - # This is a new freshman so add them to the DB - freshmen_in_db[csv_freshman.rit_username] = Freshman(rit_username=csv_freshman.rit_username, - name=csv_freshman.name, onfloor=csv_freshman.onfloor) - db.session.add(freshmen_in_db[csv_freshman.rit_username]) - else: - # This freshman is already in the DB so just update them - freshmen_in_db[csv_freshman.rit_username].onfloor = csv_freshman.onfloor - freshmen_in_db[csv_freshman.rit_username].name = csv_freshman.name - - # Update all freshmen entries that represent people who are no longer freshmen - for freshman in filter(lambda freshman: freshman.rit_username not in freshmen_in_csv, freshmen_in_db.values()): - freshman.onfloor = False - - # Update the freshmen signatures of each open or future packet - for packet in Packet.query.filter(Packet.end > datetime.now()).all(): - # Handle the freshmen that are no longer onfloor - for fresh_sig in filter(lambda fresh_sig: not fresh_sig.freshman.onfloor, packet.fresh_signatures): - FreshSignature.query.filter_by(packet_id=fresh_sig.packet_id, - freshman_username=fresh_sig.freshman_username).delete() - - # Add any new onfloor freshmen - # pylint: disable=cell-var-from-loop - current_fresh_sigs = set(map(lambda fresh_sig: fresh_sig.freshman_username, packet.fresh_signatures)) - for csv_freshman in filter(lambda csv_freshman: csv_freshman.rit_username not in current_fresh_sigs and - csv_freshman.onfloor and - csv_freshman.rit_username != packet.freshman_username, - freshmen_in_csv.values()): - db.session.add(FreshSignature(packet=packet, freshman=freshmen_in_db[csv_freshman.rit_username])) - - db.session.commit() + sync_freshman(freshmen_in_csv) print('Done!') diff --git a/packet/ldap.py b/packet/ldap.py index 1b7de82c..02a38dc9 100644 --- a/packet/ldap.py +++ b/packet/ldap.py @@ -149,8 +149,8 @@ def ldap_get_eboard_role(member): return return_val -# Status checkers +# Status checkers def ldap_is_eboard(member): """ :param member: A CSHMember instance diff --git a/packet/routes/admin.py b/packet/routes/admin.py index 5db63b36..96a877b1 100644 --- a/packet/routes/admin.py +++ b/packet/routes/admin.py @@ -1,9 +1,4 @@ -import csv -import os - -import requests -from flask import render_template, redirect, request -from werkzeug.utils import secure_filename +from flask import render_template from packet import app from packet.models import Packet, Freshman @@ -12,13 +7,13 @@ from packet.log_utils import log_cache, log_time -@app.route('/admin/') +@app.route('/admin/packets') @log_cache @packet_auth @admin_auth @before_request @log_time -def admin(info=None): +def admin_packets(info=None): open_packets = Packet.open_packets() # Pre-calculate and store the return values of did_sign(), signatures_received(), and signatures_required() @@ -29,9 +24,20 @@ def admin(info=None): open_packets.sort(key=packet_sort_key, reverse=True) + return render_template('admin_packets.html', + open_packets=open_packets, + info=info) + + +@app.route('/admin/freshmen') +@log_cache +@packet_auth +@admin_auth +@before_request +@log_time +def admin_freshmen(info=None): all_freshmen = Freshman.get_all() - return render_template('admin.html', - open_packets=open_packets, + return render_template('admin_freshmen.html', all_freshmen=all_freshmen, info=info) diff --git a/packet/routes/api.py b/packet/routes/api.py index c369835a..da94313e 100644 --- a/packet/routes/api.py +++ b/packet/routes/api.py @@ -8,16 +8,23 @@ from packet import app, db from packet.context_processors import get_rit_name -from packet.commands import packet_start_time, packet_end_time +from packet.commands import packet_start_time, packet_end_time, CSVFreshman from packet.ldap import ldap_get_eboard_role, ldap_get_active_rtps, ldap_get_3das, ldap_get_webmasters, \ ldap_get_drink_admins, ldap_get_constitutional_maintainers, ldap_is_intromember, ldap_get_active_members, \ ldap_is_on_coop, _ldap_is_member_of_group, ldap_get_member from packet.log_utils import log_time from packet.mail import send_report_mail, send_start_packet_mail -from packet.utils import before_request, packet_auth, notify_slack +from packet.utils import before_request, packet_auth, notify_slack, sync_freshman as sync_freshman_list from packet.models import Packet, MiscSignature, NotificationSubscription, Freshman, FreshSignature, UpperSignature from packet.notifications import packet_signed_notification, packet_100_percent_notification, \ - packet_starting_notification, packets_starting_notification + packet_starting_notification, packets_starting_notification + + +class POSTFreshman: + def __init__(self, freshman): + self.name = freshman['name'].strip() + self.rit_username = freshman['rit_username'].strip() + self.onfloor = freshman['onfloor'].strip() == 'TRUE' @app.route('/api/v1/freshmen', methods=['POST']) @@ -40,43 +47,9 @@ def sync_freshman(): if not _ldap_is_member_of_group(ldap_get_member(username), 'eboard-evaluations'): return 'Forbidden: not Evaluations Director', 403 - freshmen = request.json - results = list() - - packets = Packet.query.filter(Packet.end > datetime.now()).all() - - for freshman in freshmen: - rit_username = freshman['rit_username'] - name = freshman['name'] - onfloor = freshman['onfloor'] - - frosh = Freshman.query.filter_by(rit_username=rit_username).first() - if frosh: - if onfloor and not frosh.onfloor: - # Add new onfloor signature - for packet in packets: - db.session.add(FreshSignature(packet=packet, freshman=frosh)) - elif not onfloor and frosh.onfloor: - # Remove outdated onfloor signature - for packet in packets: - FreshSignature.query.filter_by(packet_id=packet.id, freshman_username=frosh.rit_username).delete() - - frosh.name = name - frosh.onfloor = onfloor - - results.append(f"'{name} ({rit_username})' updated") - else: - frosh = Freshman(rit_username=rit_username, name=name, onfloor=onfloor) - db.session.add(frosh) - if onfloor: - # Add onfloor signature - for packet in packets: - db.session.add(FreshSignature(packet=packet, freshman=frosh)) - - results.append(f"Freshman '{name} ({rit_username})' created") - - db.session.commit() - return dumps(results), 200 + freshmen_in_post = {freshman.rit_username: freshman for freshman in map(POSTFreshman, request.json)} + sync_freshman_list(freshmen_in_post) + return dumps('Done'), 200 @app.route('/api/v1/packets', methods=['POST']) @@ -164,7 +137,7 @@ def get_packets_by_user(username: str) -> dict: return {packet.id: { 'start': packet.start, 'end': packet.end, - } for packet in frosh.packets} + } for packet in frosh.packets} @app.route('/api/v1/packets//newest', methods=['GET']) @@ -178,13 +151,13 @@ def get_newest_packet_by_user(username: str) -> dict: packet = frosh.packets[-1] return { - packet.id: { - 'start': packet.start, - 'end': packet.end, - 'required': vars(packet.signatures_required()), - 'received': vars(packet.signatures_received()), - } - } + packet.id: { + 'start': packet.start, + 'end': packet.end, + 'required': vars(packet.signatures_required()), + 'received': vars(packet.signatures_received()), + } + } @app.route('/api/v1/packet/', methods=['GET']) @@ -197,9 +170,10 @@ def get_packet_by_id(packet_id: int) -> dict: packet = Packet.by_id(packet_id) return { - 'required': vars(packet.signatures_required()), - 'received': vars(packet.signatures_received()), - } + 'required': vars(packet.signatures_required()), + 'received': vars(packet.signatures_received()), + } + @app.route('/api/v1/sign//', methods=['POST']) @packet_auth @@ -259,7 +233,7 @@ def report(info): def packet_stats(packet_id): packet = Packet.by_id(packet_id) - dates = [packet.start.date() + timedelta(days=x) for x in range(0, (packet.end-packet.start).days + 1)] + dates = [packet.start.date() + timedelta(days=x) for x in range(0, (packet.end - packet.start).days + 1)] print(dates) @@ -280,15 +254,15 @@ def packet_stats(packet_id): total_stats = dict() for date in dates: total_stats[date.isoformat()] = { - 'upper': upper_stats[date], - 'fresh': fresh_stats[date], - 'misc': misc_stats[date], - } + 'upper': upper_stats[date], + 'fresh': fresh_stats[date], + 'misc': misc_stats[date], + } return { - 'packet_id': packet_id, - 'dates': total_stats, - } + 'packet_id': packet_id, + 'dates': total_stats, + } def sig2dict(sig): @@ -298,39 +272,39 @@ def sig2dict(sig): """ packet = Packet.by_id(sig.packet_id) return { - 'date': sig.updated.date(), - 'packet': { - 'id': packet.id, - 'freshman_username': packet.freshman_username, - }, - } + 'date': sig.updated.date(), + 'packet': { + 'id': packet.id, + 'freshman_username': packet.freshman_username, + }, + } @app.route('/api/v1/stats/upperclassman/') @packet_auth def upperclassman_stats(uid): - sigs = UpperSignature.query.filter( - UpperSignature.signed, - UpperSignature.member == uid - ).all() + MiscSignature.query.filter(MiscSignature.member == uid).all() + UpperSignature.signed, + UpperSignature.member == uid + ).all() + MiscSignature.query.filter(MiscSignature.member == uid).all() sig_dicts = list(map(sig2dict, sigs)) dates = set(map(lambda sd: sd['date'], sig_dicts)) return { - 'member': uid, - 'signatures': { - date.isoformat() : list( - map(lambda sd: sd['packet'], - filter(lambda sig, d=date: sig['date'] == d, - sig_dicts - ) - ) - ) for date in dates - } - } + 'member': uid, + 'signatures': { + date.isoformat(): list( + map(lambda sd: sd['packet'], + filter(lambda sig, d=date: sig['date'] == d, + sig_dicts + ) + ) + ) for date in dates + } + } + def commit_sig(packet, was_100, uid): packet_signed_notification(packet, uid) diff --git a/packet/static/js/admin.js b/packet/static/js/admin.js index f279f0c7..31dc888e 100644 --- a/packet/static/js/admin.js +++ b/packet/static/js/admin.js @@ -34,8 +34,14 @@ $(document).ready(function () { makePackets(); }); + $("#sync-freshmen").click(() => { + syncFreshmen(); + }) + }); +// Is this gross, yes. Do I feel like cleaning it up yet, no. + let makePackets = () => { let freshmen = []; let fileUpload = document.getElementById("newPacketsFile"); @@ -77,3 +83,49 @@ let makePackets = () => { } } } + + +let syncFreshmen = () => { + let freshmen = []; + let fileUpload = document.getElementById("currentFroshFile"); + let regex = /^([a-zA-Z0-9\s_\\.\-:])+(.csv|.txt)$/; + if (regex.test(fileUpload.value.toLowerCase())) { + if (typeof (FileReader) != "undefined") { + let reader = new FileReader(); + reader.onload = (e) => { + let rows = e.target.result.split("\n"); + for (let i = 0; i < rows.length; i++) { + let cells = rows[i].split(","); + if (cells.length > 1) { + freshmen.push({ + rit_username: cells[3], + name: cells[0], + onfloor: cells[1] + }); + } + } + if (freshmen.length >= 1) { + $("#sync-freshmen").append(" "); + $("#sync-freshmen").attr('disabled', true); + fetch('/api/v1/freshmen', + { + method: 'POST', + headers: { + 'Content-Type': 'application/json' + }, + body: JSON.stringify(freshmen) + } + ).then(response => { + if (response.status < 300) { + $('#sync-freshmen-modal').modal('hide'); + location.reload(); + } else { + alert("There was an syncing freshmen") + } + }) + } + } + reader.readAsText(fileUpload.files[0]); + } + } +} diff --git a/packet/templates/admin_freshmen.html b/packet/templates/admin_freshmen.html new file mode 100644 index 00000000..a94aedd9 --- /dev/null +++ b/packet/templates/admin_freshmen.html @@ -0,0 +1,27 @@ +{% extends "extend/base.html" %} + +{% block body %} +
    +
    +
    +
    +

    All Freshmen

    +
    +
    + + {% include 'include/admin/sync_freshmen.html' %} +
    +
    +
    +
    + {% include 'include/admin/all_freshmen.html' %} +
    +
    +{% endblock %} + +{% block scripts %} + {{ super() }} + +{% endblock %} diff --git a/packet/templates/admin.html b/packet/templates/admin_packets.html similarity index 100% rename from packet/templates/admin.html rename to packet/templates/admin_packets.html diff --git a/packet/templates/include/admin/new_packets.html b/packet/templates/include/admin/new_packets.html index ba0667a2..c6dd3075 100644 --- a/packet/templates/include/admin/new_packets.html +++ b/packet/templates/include/admin/new_packets.html @@ -3,7 +3,7 @@
    - + diff --git a/packet/templates/include/admin/sync_freshmen.html b/packet/templates/include/admin/sync_freshmen.html new file mode 100644 index 00000000..6f9b4806 --- /dev/null +++ b/packet/templates/include/admin/sync_freshmen.html @@ -0,0 +1,22 @@ + diff --git a/packet/templates/include/nav.html b/packet/templates/include/nav.html index 02a15e4c..470764dc 100644 --- a/packet/templates/include/nav.html +++ b/packet/templates/include/nav.html @@ -18,9 +18,18 @@
  • Signatures
    • -
  • - Admin -
    • + {% if info.admin %} +
  • + +
    + Freshmen + Packets +
    +
    • + {% endif %} {% else %}
  • diff --git a/packet/utils.py b/packet/utils.py index 5ffec074..83d4b760 100644 --- a/packet/utils.py +++ b/packet/utils.py @@ -1,14 +1,14 @@ """ General utilities and decorators for supporting the Python logic """ - +from datetime import datetime from functools import wraps, lru_cache import requests from flask import session, redirect -from packet import auth, app -from packet.models import Freshman +from packet import auth, app, db +from packet.models import Freshman, FreshSignature, Packet from packet.ldap import ldap_get_member, ldap_is_intromember, ldap_is_evals, ldap_is_rtp INTRO_REALM = 'https://sso.csh.rit.edu/auth/realms/intro' @@ -21,6 +21,7 @@ def before_request(func): @wraps(func) def wrapped_function(*args, **kwargs): uid = str(session['userinfo'].get('preferred_username', '')) + member = ldap_get_member(uid) if session['id_token']['iss'] == INTRO_REALM: info = { @@ -31,7 +32,8 @@ def wrapped_function(*args, **kwargs): else: info = { 'realm': 'csh', - 'uid': uid + 'uid': uid, + 'admin': ldap_is_evals(member) or ldap_is_rtp(member) } kwargs['info'] = info @@ -100,3 +102,40 @@ def notify_slack(name: str): msg = f':pizza-party: {name} got :100: on packet! :pizza-party:' requests.put(app.config['SLACK_WEBHOOK_URL'], json={'text':msg}) app.logger.info('Posted 100% notification to slack for ' + name) + + +def sync_freshman(freshmen_list): + freshmen_in_db = {freshman.rit_username: freshman for freshman in Freshman.query.all()} + + for list_freshman in freshmen_list.values(): + if list_freshman.rit_username not in freshmen_in_db: + # This is a new freshman so add them to the DB + freshmen_in_db[list_freshman.rit_username] = Freshman(rit_username=list_freshman.rit_username, + name=list_freshman.name, onfloor=list_freshman.onfloor) + db.session.add(freshmen_in_db[list_freshman.rit_username]) + else: + # This freshman is already in the DB so just update them + freshmen_in_db[list_freshman.rit_username].onfloor = list_freshman.onfloor + freshmen_in_db[list_freshman.rit_username].name = list_freshman.name + + # Update all freshmen entries that represent people who are no longer freshmen + for freshman in filter(lambda freshman: freshman.rit_username not in freshmen_list, freshmen_in_db.values()): + freshman.onfloor = False + + # Update the freshmen signatures of each open or future packet + for packet in Packet.query.filter(Packet.end > datetime.now()).all(): + # Handle the freshmen that are no longer onfloor + for fresh_sig in filter(lambda fresh_sig: not fresh_sig.freshman.onfloor, packet.fresh_signatures): + FreshSignature.query.filter_by(packet_id=fresh_sig.packet_id, + freshman_username=fresh_sig.freshman_username).delete() + + # Add any new onfloor freshmen + # pylint: disable=cell-var-from-loop + current_fresh_sigs = set(map(lambda fresh_sig: fresh_sig.freshman_username, packet.fresh_signatures)) + for list_freshman in filter(lambda list_freshman: list_freshman.rit_username not in current_fresh_sigs and + list_freshman.onfloor and + list_freshman.rit_username != packet.freshman_username, + freshmen_list.values()): + db.session.add(FreshSignature(packet=packet, freshman=freshmen_in_db[list_freshman.rit_username])) + + db.session.commit() From 6c94112136417a286d5bc92ebc24c46ea2bd897f Mon Sep 17 00:00:00 2001 From: Devin Matte Date: Wed, 19 Aug 2020 10:22:29 -0400 Subject: [PATCH 3/5] Fixing for frosh --- packet/utils.py | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/packet/utils.py b/packet/utils.py index 83d4b760..50835817 100644 --- a/packet/utils.py +++ b/packet/utils.py @@ -13,23 +13,25 @@ INTRO_REALM = 'https://sso.csh.rit.edu/auth/realms/intro' + def before_request(func): """ Credit to Liam Middlebrook and Ram Zallan https://github.com/liam-middlebrook/gallery """ + @wraps(func) def wrapped_function(*args, **kwargs): uid = str(session['userinfo'].get('preferred_username', '')) - member = ldap_get_member(uid) - if session['id_token']['iss'] == INTRO_REALM: info = { 'realm': 'intro', 'uid': uid, - 'onfloor': is_freshman_on_floor(uid) + 'onfloor': is_freshman_on_floor(uid), + 'admin': False # It's always false if frosh } else: + member = ldap_get_member(uid) info = { 'realm': 'csh', 'uid': uid, @@ -58,6 +60,7 @@ def packet_auth(func): """ Decorator for easily configuring oidc """ + @auth.oidc_auth('app') @wraps(func) def wrapped_function(*args, **kwargs): @@ -76,6 +79,7 @@ def admin_auth(func): """ Decorator for easily configuring oidc """ + @auth.oidc_auth('app') @wraps(func) def wrapped_function(*args, **kwargs): @@ -85,6 +89,8 @@ def wrapped_function(*args, **kwargs): if not ldap_is_evals(member) and not ldap_is_rtp(member): app.logger.warn('Stopped member {} from accessing admin UI'.format(username)) return redirect(app.config['PROTOCOL'] + app.config['PACKET_UPPER'], code=301) + else: + return redirect(app.config['PROTOCOL'] + app.config['PACKET_INTRO'], code=301) return func(*args, **kwargs) @@ -100,7 +106,7 @@ def notify_slack(name: str): return msg = f':pizza-party: {name} got :100: on packet! :pizza-party:' - requests.put(app.config['SLACK_WEBHOOK_URL'], json={'text':msg}) + requests.put(app.config['SLACK_WEBHOOK_URL'], json={'text': msg}) app.logger.info('Posted 100% notification to slack for ' + name) @@ -111,7 +117,8 @@ def sync_freshman(freshmen_list): if list_freshman.rit_username not in freshmen_in_db: # This is a new freshman so add them to the DB freshmen_in_db[list_freshman.rit_username] = Freshman(rit_username=list_freshman.rit_username, - name=list_freshman.name, onfloor=list_freshman.onfloor) + name=list_freshman.name, + onfloor=list_freshman.onfloor) db.session.add(freshmen_in_db[list_freshman.rit_username]) else: # This freshman is already in the DB so just update them @@ -133,9 +140,9 @@ def sync_freshman(freshmen_list): # pylint: disable=cell-var-from-loop current_fresh_sigs = set(map(lambda fresh_sig: fresh_sig.freshman_username, packet.fresh_signatures)) for list_freshman in filter(lambda list_freshman: list_freshman.rit_username not in current_fresh_sigs and - list_freshman.onfloor and - list_freshman.rit_username != packet.freshman_username, - freshmen_list.values()): + list_freshman.onfloor and + list_freshman.rit_username != packet.freshman_username, + freshmen_list.values()): db.session.add(FreshSignature(packet=packet, freshman=freshmen_in_db[list_freshman.rit_username])) db.session.commit() From e32a90448b322020a3fa0be5423797e668e8116f Mon Sep 17 00:00:00 2001 From: Devin Matte Date: Wed, 19 Aug 2020 10:25:09 -0400 Subject: [PATCH 4/5] Fixing pylint --- packet/routes/api.py | 2 +- packet/templates/admin_freshmen.html | 2 +- packet/templates/admin_packets.html | 12 +----------- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/packet/routes/api.py b/packet/routes/api.py index da94313e..a3eaa867 100644 --- a/packet/routes/api.py +++ b/packet/routes/api.py @@ -8,7 +8,7 @@ from packet import app, db from packet.context_processors import get_rit_name -from packet.commands import packet_start_time, packet_end_time, CSVFreshman +from packet.commands import packet_start_time, packet_end_time from packet.ldap import ldap_get_eboard_role, ldap_get_active_rtps, ldap_get_3das, ldap_get_webmasters, \ ldap_get_drink_admins, ldap_get_constitutional_maintainers, ldap_is_intromember, ldap_get_active_members, \ ldap_is_on_coop, _ldap_is_member_of_group, ldap_get_member diff --git a/packet/templates/admin_freshmen.html b/packet/templates/admin_freshmen.html index a94aedd9..e922375f 100644 --- a/packet/templates/admin_freshmen.html +++ b/packet/templates/admin_freshmen.html @@ -23,5 +23,5 @@

    All Freshmen

    {% block scripts %} {{ super() }} - + {% endblock %} diff --git a/packet/templates/admin_packets.html b/packet/templates/admin_packets.html index d9c81abd..576428de 100644 --- a/packet/templates/admin_packets.html +++ b/packet/templates/admin_packets.html @@ -18,20 +18,10 @@

    Active Packets

    {% include 'include/admin/open_packets.html' %}
    -{#
    #} -{#
    #} -{#
    #} -{#

    All Freshmen

    #} -{#
    #} -{#
    #} -{#
    #} -{#
    #} -{# {% include 'include/admin/all_freshmen.html' %}#} -{#
    #} {% endblock %} {% block scripts %} {{ super() }} - + {% endblock %} From 4a900d9a815951e2dbd2614e6ee3671dfeb72c69 Mon Sep 17 00:00:00 2001 From: Devin Matte Date: Wed, 19 Aug 2020 20:25:20 -0400 Subject: [PATCH 5/5] Fixing pylint error --- packet/routes/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packet/routes/api.py b/packet/routes/api.py index 6a80478a..cb70e30b 100644 --- a/packet/routes/api.py +++ b/packet/routes/api.py @@ -238,7 +238,7 @@ def packet_stats(packet_id): @app.route('/api/v1/stats/upperclassman/') @packet_auth def upperclassman_stats(uid): - return stats.upperclassman_stats(uid) + return stats.upperclassman_stats(uid) def commit_sig(packet, was_100, uid):