Merge pull request #602 from ComputerScienceHouse/bootstrap-5

Bootstrap 5

Author: shaeespring

.env.example

@@ -0,0 +1,13 @@
+CONDITIONAL_DEBUG=true
+CONDITIONAL_HOST_NAME="localhost:8080"
+CONDITIONAL_SERVER_NAME="localhost:8080"
+CONDITIONAL_IP="0.0.0.0"
+CONDITIONAL_PORT=8080
+CONDITIONAL_PROFILING=false # change this to true if you want to see function call times
+CONDITIONAL_LDAP_BIND_DN="uid=<you>,cn=users,cn=accounts,dc=csh,dc=rit,dc=edu"
+CONDITIONAL_LDAP_BIND_PW=
+CONDITIONAL_OIDC_ISSUER="https://sso.csh.rit.edu/auth/realms/csh"
+CONDITIONAL_OIDC_CLIENT_ID=develop
+CONDITIONAL_OIDC_CLIENT_SECRET=
+CONDITIONAL_OIDC_CLIENT_REDIRECT_URI="http://localhost:8080/redirect_uri"
+CONDITIONAL_OIDC_CLIENT_LOGOUT="http://localhost:8080/logout"

README.md

@@ -70,7 +70,10 @@ python -m gunicorn
 
 ## Config
 
-You must create `config.py` in the top-level directory with the appropriate credentials for the application to run. See `config.env.py` for an example.
+Either copy `.env.example` to `.env` or `config.env.py` to `config.py`, and change the variables in the newly copied file accordingly. The only three variables you should need to change are:
+- LDAP_BIND_DN, replacing `<you>` for your username
+- LDAP_BIND_PW, your password
+- OIDC_CLIENT_SECRET, from the Wiki
 
 ### Add OIDC Config
 Reach out to an RTP to get OIDC credentials that will allow you to develop locally behind OIDC auth

conditional/blueprints/attendance.py

@@ -36,11 +36,11 @@ def get_all_members(user_dict=None):
     log.info('Retrieve Technical Seminar Attendance List')
 
     members = ldap.get_group_member_attributes(groups=['current_student'],
-                                               excluded_groups=[], attributes=['uid', 'displayName'])
+                                               attributes=['uid', 'displayName'])
 
     named_members = [
         {
-            'display': f.name,
+            'label': f.name,
             'value': f.id,
             'freshman': True
         } for f in FreshmanAccount.query.filter(
@@ -49,7 +49,7 @@ def get_all_members(user_dict=None):
     for account in members:
         named_members.append(
             {
-                'display': account['displayName'],
+                'label': account['displayName'],
                 'value': account['uid'],
                 'freshman': False
             })
@@ -66,7 +66,7 @@ def get_non_alumni_non_coop(internal=False, user_dict=None):
 
     # Get all active members as a base house meeting attendance.
     active_members = ldap.get_group_member_attributes(groups=['active'],
-                                                      excluded_groups=[], attributes=['uid', 'displayName'])
+                                                      attributes=['uid', 'displayName'])
 
     if datetime.today() < datetime(start_of_year().year, 12, 31):
         semester = 'Fall'
@@ -79,7 +79,7 @@ def get_non_alumni_non_coop(internal=False, user_dict=None):
 
     eligible_members = [
         {
-            'display': f.name,
+            'label': f.name,
             'value': f.id,
             'freshman': True
         } for f in FreshmanAccount.query.filter(
@@ -92,7 +92,7 @@ def get_non_alumni_non_coop(internal=False, user_dict=None):
 
         eligible_members.append(
             {
-                'display': account['displayName'],
+                'label': account['displayName'],
                 'value': account['uid'],
                 'freshman': False
             })
@@ -112,12 +112,11 @@ def get_non_alumni(user_dict=None):
 
     current_students = ldap.get_group_member_attributes(
         groups=['current_student'],
-        excluded_groups=[],
         attributes=['uid', 'displayName', 'nsAccountLock'])
 
     eligible_members = [
         {
-            'display': f.name,
+            'label': f.name,
             'value': f.id,
             'freshman': True
         } for f in FreshmanAccount.query.filter(
@@ -129,7 +128,7 @@ def get_non_alumni(user_dict=None):
 
         eligible_members.append(
             {
-                'display': account['displayName'],
+                'label': account['displayName'],
                 'value': account['uid'],
                 'freshman': False
             })
@@ -171,10 +170,14 @@ def display_attendance_hm(user_dict=None):
     if not user_dict_is_eval_director(user_dict):
         return redirect("/dashboard")
 
+    members = get_non_alumni_non_coop(internal=True)
+
+    print(members)
+
     return render_template('attendance_hm.html',
                            username=user_dict['username'],
                            date=datetime.now().strftime("%Y-%m-%d"),
-                           members=get_non_alumni_non_coop(internal=True))
+                           members=members)
 
 
 @attendance_bp.route('/attendance/adhoc_history', methods=['GET'])
@@ -394,53 +397,73 @@ def alter_house_excuse(uid, hid, user_dict=None):
 @auth.oidc_auth("default")
 @get_user
 def attendance_history(user_dict=None):
+    member_names = { member['uid']: member['displayName']
+                    for member in ldap.get_group_member_attributes(groups=['current_student'],
+                                                                   attributes=['uid', 'displayName']) }
+
+    def get_member_name(uid):
+        if uid in member_names:
+            return member_names[uid]
+
+        name = ldap_get_member(uid).displayName
+        member_names[uid] = name
+        return name
 
     def get_meeting_attendees(meeting_id):
-        attendees = [ldap_get_member(a.uid).displayName for a in
+        attendees = [get_member_name(a.uid) for a in
                      MemberCommitteeAttendance.query.filter(
                      MemberCommitteeAttendance.meeting_id == meeting_id).all()]
 
-        for freshman in [a.fid for a in
+        freshmen_attendees = [a.fid for a in
                          FreshmanCommitteeAttendance.query.filter(
-                         FreshmanCommitteeAttendance.meeting_id == meeting_id).all()]:
+                         FreshmanCommitteeAttendance.meeting_id == meeting_id).all()]
+
+        for freshman in freshmen_attendees:
             attendees.append(FreshmanAccount.query.filter(
                              FreshmanAccount.id == freshman).first().name)
+
         return attendees
 
     def get_seminar_attendees(meeting_id):
-        attendees = [ldap_get_member(a.uid).displayName for a in
+        attendees = [get_member_name(a.uid) for a in
                      MemberSeminarAttendance.query.filter(
                      MemberSeminarAttendance.seminar_id == meeting_id).all()]
-
-        for freshman in [a.fid for a in
+        freshmen_attendees = [a.fid for a in
                          FreshmanSeminarAttendance.query.filter(
-                         FreshmanSeminarAttendance.seminar_id == meeting_id).all()]:
+                         FreshmanSeminarAttendance.seminar_id == meeting_id).all()]
+
+        for freshman in freshmen_attendees:
             attendees.append(FreshmanAccount.query.filter(
                              FreshmanAccount.id == freshman).first().name)
+
         return attendees
 
     def get_seminar_hosts(meeting_id):
-        hosts = [ldap_get_member(a.uid).displayName for a in
+        hosts = [get_member_name(a.uid) for a in
                  MemberSeminarHost.query.filter(
                  MemberSeminarHost.seminar_id == meeting_id).all()]
 
-        for freshman in [a.fid for a in
+        freshmen_hosts = [a.fid for a in
                          FreshmanSeminarHost.query.filter(
-                         FreshmanSeminarHost.seminar_id == meeting_id).all()]:
+                         FreshmanSeminarHost.seminar_id == meeting_id).all()]
+
+        for freshman in freshmen_hosts:
             hosts.append(FreshmanAccount.query.filter(
                          FreshmanAccount.id == freshman).first().name)
+
         return hosts
 
     log = logger.new(request=request, auth_dict=user_dict)
 
     if not user_dict_is_eboard(user_dict):
         return jsonify({"success": False, "error": "Not EBoard"}), 403
 
-
     page = request.args.get('page', 1)
+    page_size = int(request.args.get('size', 10))
+
     log.info('View Past Attendance Submitions')
-    offset = 0 if int(page) == 1 else ((int(page)-1)*10)
-    limit = int(page)*10
+    offset = 0 if int(page) == 1 else ((int(page) - 1) * 10)
+    limit = int(page) * page_size
     all_cm = [{"id": m.id,
                "name": m.committee,
                "adhoc": m.adhoc,
@@ -451,6 +474,7 @@ def get_seminar_hosts(meeting_id):
                } for m in CommitteeMeeting.query.filter(
                    CommitteeMeeting.timestamp > start_of_year(),
                    CommitteeMeeting.approved).all()]
+
     all_ts = [{"id": m.id,
                "name": m.name,
                "dt_obj": m.timestamp,
@@ -461,6 +485,7 @@ def get_seminar_hosts(meeting_id):
                } for m in TechnicalSeminar.query.filter(
                    TechnicalSeminar.timestamp > start_of_year(),
                    TechnicalSeminar.approved).all()]
+
     pend_cm = [{"id": m.id,
                 "name": m.committee,
                 "adhoc": m.adhoc,
@@ -470,6 +495,7 @@ def get_seminar_hosts(meeting_id):
                } for m in CommitteeMeeting.query.filter(
                    CommitteeMeeting.timestamp > start_of_year(),
                    CommitteeMeeting.approved == False).all()] # pylint: disable=singleton-comparison
+
     pend_ts = [{"id": m.id,
                 "name": m.name,
                 "dt_obj": m.timestamp,
@@ -479,20 +505,47 @@ def get_seminar_hosts(meeting_id):
                } for m in TechnicalSeminar.query.filter(
                    TechnicalSeminar.timestamp > start_of_year(),
                    TechnicalSeminar.approved == False).all()] # pylint: disable=singleton-comparison
+
     all_meetings = sorted((all_cm + all_ts), key=lambda k: k['dt_obj'], reverse=True)[offset:limit]
-    if len(all_cm) % 10 != 0:
-        total_pages = int(len(all_cm) / 10) + 1
+    if len(all_cm) % page_size != 0:
+        total_pages = int(len(all_cm) / page_size) + 1
     else:
-        total_pages = int(len(all_cm) / 10)
+        total_pages = int(len(all_cm) / page_size)
+
+    page_size_options = [
+        {
+            'value': 10,
+            'label': '10'
+        },
+        {
+            'value': 25,
+            'label': '25'
+        },
+        {
+            'value': 50,
+            'label': '50'
+        },
+        {
+            'value': 100,
+            'label': '100'
+        },
+        {
+            'value': -1,
+            'label': 'all'
+        }
+    ]
+
+    selected_page_size = list(filter(lambda opt: opt['value'] == page_size, page_size_options))[0]
+
     return render_template('attendance_history.html',
                            username=user_dict['username'],
                            history=all_meetings,
                            pending_cm=pend_cm,
                            pending_ts=pend_ts,
-                           all_ts=all_ts,
                            num_pages=total_pages,
-                           current_page=int(page))
-
+                           page_size=selected_page_size,
+                           current_page=int(page),
+                           page_sizes=page_size_options)
 
 @attendance_bp.route('/attendance/alter/cm/<cid>', methods=['POST'])
 @auth.oidc_auth("default")

conditional/blueprints/co_op.py

@@ -3,7 +3,6 @@
 
 from conditional import db, start_of_year, auth
 from conditional.models.models import CurrentCoops
-from conditional.util.member import req_cm
 from conditional.util.auth import get_user
 from conditional.util.flask import render_template
 from conditional.util.ldap import _ldap_add_member_to_group as ldap_add_member_to_group
@@ -58,7 +57,6 @@ def submit_co_op_form(user_dict=None):
     db.session.add(co_op)
     db.session.flush()
     db.session.commit()
-    req_cm.cache_clear()
 
     return jsonify({"success": True}), 200
 
@@ -84,7 +82,6 @@ def delete_co_op(uid, user_dict=None):
 
     db.session.flush()
     db.session.commit()
-    req_cm.cache_clear()
 
     return jsonify({"success": True}), 200
 
@@ -99,7 +96,7 @@ def display_co_op_management(user_dict=None):
     if not user_dict_is_eval_director(user_dict):
         return "must be eval director", 403
 
-    co_op_list = [(member.semester, member.uid)
+    co_op_list = [{ 'semester': member.semester, 'uid': member.uid}
                   for member in CurrentCoops.query.filter(
             CurrentCoops.date_created > start_of_year(),
             CurrentCoops.semester != "Neither")]

conditional/blueprints/dashboard.py

@@ -54,9 +54,9 @@ def display_dashboard(user_dict=None):
                             "Active Members": len(ldap_get_active_member_uids())}
     # freshman shit
     if user_dict_is_intromember(user_dict):
-        data['freshman'] = get_freshman_data(uid)
+        data['intro'] = get_freshman_data(uid)
     else:
-        data['freshman'] = None
+        data['intro'] = None
 
     spring = {}
     c_meetings = get_cm(user_dict['account'])
@@ -163,8 +163,9 @@ def display_dashboard(user_dict=None):
 
     data['cm_attendance'] = c_meetings
     data['cm_attendance_len'] = len(c_meetings)
-    data['hm_attendance'] = hm_attendance
-    data['hm_attendance_len'] = len(hm_attendance)
+
+    data['missed_hm'] = hm_attendance
+    data['missed_hm_len'] = len(hm_attendance)
 
     gatekeep_info = gatekeep_values(uid)
     gatekeep_result = 'disenfranchised'

conditional/blueprints/gatekeep.py

@@ -17,7 +17,7 @@
 @gatekeep_bp.route('/gatekeep_status/')
 @auth.oidc_auth("default")
 @get_user
-def display_spring_evals(internal=False, user_dict=None):
+def display_spring_evals(internal=False, user_dict=None): # pylint: disable-msg=too-many-locals
     log = logger.new(request=request, auth_dict=user_dict)
     log.info('Display Gatekeep Status Listing')
 
@@ -88,7 +88,7 @@ def display_spring_evals(internal=False, user_dict=None):
     ).all()}
 
     gk_members = []
-    for account in ldap.get_group_member_attributes(groups=['active'], excluded_groups=[], attributes=['uid', 'cn']):
+    for account in ldap.get_group_member_attributes(groups=['active'], attributes=['uid', 'cn']):
         uid = account['uid']
         name = account['cn']
 
@@ -118,10 +118,16 @@ def display_spring_evals(internal=False, user_dict=None):
         if passing:
             status = 'passed'
 
+        status_int = 0
+
+        if passing:
+            status_int = 1
+
         member = {
             'name': name,
             'uid': uid,
             'status': status,
+            'status_int': status_int,
             'committee_meetings': cm_attended_count,
             'technical_seminars': ts_attended_count,
             'technical_seminars_hosted': ts_hosted_count,
@@ -136,6 +142,7 @@ def display_spring_evals(internal=False, user_dict=None):
     gk_members.sort(key=lambda x: x['committee_meetings'], reverse=True)
     gk_members.sort(key=lambda x: x['technical_seminars'], reverse=True)
     gk_members.sort(key=lambda x: len(x['house_meetings_missed']))
+    gk_members.sort(key=lambda x: x['status_int'], reverse=True)
     # return names in 'first last (username)' format
     if internal:
         return gk_members