Merge branch 'develop' into bootstrap-5

Author: BigSpaceships

.gitignore

@@ -23,6 +23,8 @@ var/
 .installed.cfg
 *.egg
 
+.env
+
 # PyInstaller
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
@@ -69,6 +71,9 @@ target/
 # Cloud9 IDE
 /.c9
 
+# VS Codepy
+.vscode/
+
 # Sensitive project files
 /config.json
 /config.py

README.md

@@ -8,45 +8,23 @@ A comprehensive membership evaluations solution for Computer Science House.
 Development
 -----------
 
-### Config
+## Running (containerized)
 
-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.
-
-#### Add OIDC Config
-Reach out to an RTP to get OIDC credentials that will allow you to develop locally behind OIDC auth
-```py
-# OIDC Config
-OIDC_ISSUER = "https://sso.csh.rit.edu/auth/realms/csh"
-OIDC_CLIENT_CONFIG = {
-    'client_id': '',
-    'client_secret': '',
-    'post_logout_redirect_uris': ['http://0.0.0.0:6969/logout']
-}
-```
-
-#### Add S3 Config
-An S3 bucket is used to store files that users upload (currently just for major project submissions). In order to have this work properly, you need to provide some credentials to the app.
+It is likely easier to use containers like `podman` or `docker` or the corresponding compose file
 
-There are 2 ways that you can get the needed credentials. 
-1. Reach out to an RTP for creds to the dev bucket
-2. Create your own bucket using [DEaDASS](https://deadass.csh.rit.edu/), and the site will give you the credentials you need. 
+With podman, I have been using 
 
-```py
-S3_URI = env.get("S3_URI", "https://s3.csh.rit.edu")
-S3_BUCKET_ID = env.get("S3_BUCKET_ID", "major-project-media")
-AWS_ACCESS_KEY_ID = env.get("AWS_ACCESS_KEY_ID", "")
-AWS_SECRET_ACCESS_KEY = env.get("AWS_SECRET_ACCESS_KEY", "")
+```sh
+podman compose up --watch
 ```
 
-#### Database 
-You can either develop using the dev database, or use the local database provided in the docker compose file
-
-Using the local database is detailed below, but both options will require the dev database password, so you will have to ask an RTP for this too
-
-#### Forcing evals/rtp or anything else
-All of the role checking is done in `conditional/utils/user_dict.py`, and you can change the various functions to `return True` for debugging
+If you want, you can run without auto rebuild using
+```sh
+podman compose up --force-recreate --build
+```
+Which can be restarted every time changes are made.
 
-### Run (Without Docker)
+## Run (Without Docker)
 
 To run the application without using containers, you must have the latest version of [Python 3](https://www.python.org/downloads/) and [virtualenv](https://virtualenv.pypa.io/en/stable/installation/) installed. Once you have those installed, create a new virtualenv and install the Python dependencies:
 
@@ -90,30 +68,53 @@ or
 python -m gunicorn
 ```
 
-### Run (containerized)
+## Config
 
-It is likely easier to use containers like `podman` or `docker` or the corresponding compose file
-
-With podman, I have been using 
+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.
 
-```sh
-podman compose up --watch
+### Add OIDC Config
+Reach out to an RTP to get OIDC credentials that will allow you to develop locally behind OIDC auth
+```py
+# OIDC Config
+OIDC_ISSUER = "https://sso.csh.rit.edu/auth/realms/csh"
+OIDC_CLIENT_CONFIG = {
+    'client_id': '',
+    'client_secret': '',
+    'post_logout_redirect_uris': ['http://0.0.0.0:6969/logout']
+}
 ```
 
-If you want, you can run without compose support using
-```sh
-podman compose up --force-recreate --build
+### Add S3 Config
+An S3 bucket is used to store files that users upload (currently just for major project submissions). In order to have this work properly, you need to provide some credentials to the app.
+
+There are 2 ways that you can get the needed credentials. 
+1. Reach out to an RTP for creds to the dev bucket
+2. Create your own bucket using [DEaDASS](https://deadass.csh.rit.edu/), and the site will give you the credentials you need. 
+
+```py
+S3_URI = env.get("S3_URI", "https://s3.csh.rit.edu")
+S3_BUCKET_ID = env.get("S3_BUCKET_ID", "major-project-media")
+AWS_ACCESS_KEY_ID = env.get("AWS_ACCESS_KEY_ID", "")
+AWS_SECRET_ACCESS_KEY = env.get("AWS_SECRET_ACCESS_KEY", "")
 ```
 
-Which can be restarted every time changes are made
+### Database 
+You can either develop using the dev database, or use the local database provided in the docker compose file
+
+Using the local database is detailed below, but both options will require the dev database password, so you will have to ask an RTP for this too
+
+### Forcing evals/rtp or anything else
+All of the role checking is done in `conditional/utils/user_dict.py`, and you can change the various functions to `return True` for debugging
+
+
 
-### Dependencies
+## Dependencies
 
 To add new dependencies, add them to `requirements.in` and then run `pip-compile requirements.in` to produce a new locked `requirements.txt`. Do not edit `requirements.txt` directly as it will be overwritten by future PRs.
 
-### Database Stuff
+## Database Stuff
 
-#### Local database
+### Local database
 
 You can run the database locally using the docker compose
 
@@ -130,7 +131,7 @@ To run migration commands in the local database, you can run the commands inside
 podman exec conditional flask db upgrade
 ```
 
-#### Database Migrations
+### Database Migrations
 
 If the database schema is changed after initializing the database, you must migrate it to the new schema by running:
 

conditional/blueprints/attendance.py

@@ -10,10 +10,12 @@
 from conditional.models.models import FreshmanCommitteeAttendance
 from conditional.models.models import FreshmanHouseMeetingAttendance
 from conditional.models.models import FreshmanSeminarAttendance
+from conditional.models.models import FreshmanSeminarHost
 from conditional.models.models import HouseMeeting
 from conditional.models.models import MemberCommitteeAttendance
 from conditional.models.models import MemberHouseMeetingAttendance
 from conditional.models.models import MemberSeminarAttendance
+from conditional.models.models import MemberSeminarHost
 from conditional.models.models import TechnicalSeminar
 from conditional.util.auth import get_user
 from conditional.util.flask import render_template
@@ -218,6 +220,8 @@ def submit_seminar_attendance(user_dict=None):
     seminar_name = post_data['name']
     m_attendees = post_data['members']
     f_attendees = post_data['freshmen']
+    m_host = post_data['member_host']
+    f_host = post_data['freshman_host']
     timestamp = post_data['timestamp']
 
     timestamp = datetime.strptime(timestamp, "%Y-%m-%d")
@@ -228,12 +232,24 @@ def submit_seminar_attendance(user_dict=None):
     db.session.refresh(seminar)
 
     for m in m_attendees:
+        if m in m_host:
+            log.info(f'Skipped giving Attendence to {m} for {seminar_name}')
+            continue
         log.info(f'Gave Attendance to {m} for {seminar_name}')
         db.session.add(MemberSeminarAttendance(m, seminar.id))
+    for m in m_host:
+        log.info(f'Gave Host Credit to {m} for {seminar_name}')
+        db.session.add(MemberSeminarHost(m, seminar.id))
 
     for f in f_attendees:
+        if f in f_host:
+            log.info(f'Skipped giving Attendance to freshman-{f} for {seminar_name}')
+            continue
         log.info(f'Gave Attendance to freshman-{f} for {seminar_name}')
         db.session.add(FreshmanSeminarAttendance(f, seminar.id))
+    for f in f_host:
+        log.info(f'Gave Host Credit to freshman-{f} for {seminar_name}')
+        db.session.add(FreshmanSeminarHost(f, seminar.id))
 
     db.session.commit()
     return jsonify({"success": True}), 200
@@ -379,6 +395,18 @@ def get_seminar_attendees(meeting_id):
                              FreshmanAccount.id == freshman).first().name)
         return attendees
 
+    def get_seminar_hosts(meeting_id):
+        hosts = [ldap_get_member(a.uid).displayName for a in
+                 MemberSeminarHost.query.filter(
+                 MemberSeminarHost.seminar_id == meeting_id).all()]
+
+        for freshman in [a.fid for a in
+                         FreshmanSeminarHost.query.filter(
+                         FreshmanSeminarHost.seminar_id == meeting_id).all()]:
+            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):
@@ -402,6 +430,7 @@ def get_seminar_attendees(meeting_id):
                "name": m.name,
                "dt_obj": m.timestamp,
                "date": m.timestamp.strftime("%a %m/%d/%Y"),
+               "hosts": get_seminar_hosts(m.id),
                "attendees": get_seminar_attendees(m.id),
                "type": "ts"
                } for m in TechnicalSeminar.query.filter(
@@ -419,6 +448,7 @@ def get_seminar_attendees(meeting_id):
                 "name": m.name,
                 "dt_obj": m.timestamp,
                 "date": m.timestamp.strftime("%a %m/%d/%Y"),
+                "hosts": get_seminar_hosts(m.id),
                 "attendees": get_seminar_attendees(m.id)
                } for m in TechnicalSeminar.query.filter(
                    TechnicalSeminar.timestamp > start_of_year(),
@@ -433,6 +463,7 @@ def get_seminar_attendees(meeting_id):
                            history=all_meetings,
                            pending_cm=pend_cm,
                            pending_ts=pend_ts,
+                           all_ts=all_ts,
                            num_pages=total_pages,
                            current_page=int(page))
 
@@ -483,19 +514,37 @@ def alter_seminar_attendance(sid, user_dict=None):
     meeting_id = sid
     m_attendees = post_data['members']
     f_attendees = post_data['freshmen']
+    m_host = post_data['member_host']
+    f_host = post_data['freshman_host']
 
     FreshmanSeminarAttendance.query.filter(
         FreshmanSeminarAttendance.seminar_id == meeting_id).delete()
 
+    FreshmanSeminarHost.query.filter(
+        FreshmanSeminarHost.seminar_id == meeting_id).delete()
+
     MemberSeminarAttendance.query.filter(
         MemberSeminarAttendance.seminar_id == meeting_id).delete()
 
+    MemberSeminarHost.query.filter(
+        MemberSeminarHost.seminar_id == meeting_id).delete()
+
     for m in m_attendees:
+        if m in m_host:
+            continue
         db.session.add(MemberSeminarAttendance(m, meeting_id))
 
+    for m in m_host:
+        db.session.add(MemberSeminarHost(m, meeting_id))
+
     for f in f_attendees:
+        if f in f_host:
+            continue
         db.session.add(FreshmanSeminarAttendance(f, meeting_id))
 
+    for f in f_host:
+        db.session.add(FreshmanSeminarHost(f, meeting_id))
+
     db.session.flush()
     db.session.commit()
     return jsonify({"success": True}), 200
@@ -512,12 +561,25 @@ def get_cm_attendees(sid, user_dict=None):
                      MemberSeminarAttendance.query.filter(
                      MemberSeminarAttendance.seminar_id == sid).all()]
 
+        host = [{"value": a.uid,
+                 "display": ldap_get_member(a.uid).displayName
+                } for a in
+                MemberSeminarHost.query.filter(
+                MemberSeminarHost.seminar_id == sid).all()]
+
         for freshman in [{"value": a.fid,
                           "display": FreshmanAccount.query.filter(FreshmanAccount.id == a.fid).first().name
                          } for a in FreshmanSeminarAttendance.query.filter(
                          FreshmanSeminarAttendance.seminar_id == sid).all()]:
             attendees.append(freshman)
-        return jsonify({"attendees": attendees}), 200
+
+        for freshman in [{"value": a.fid,
+                          "display": FreshmanAccount.query.filter(FreshmanAccount.id == a.fid).first().name
+                         } for a in FreshmanSeminarHost.query.filter(
+                         FreshmanSeminarHost.seminar_id == sid).all()]:
+            host.append(freshman)
+
+        return jsonify({"attendees": attendees, "host": host}), 200
 
     log = logger.new(request=request, auth_dict=user_dict)
     log.info(f'Delete Technical Seminar {sid}')
@@ -527,8 +589,12 @@ def get_cm_attendees(sid, user_dict=None):
 
     FreshmanSeminarAttendance.query.filter(
         FreshmanSeminarAttendance.seminar_id == sid).delete()
+    FreshmanSeminarHost.query.filter(
+        FreshmanSeminarHost.seminar_id == sid).delete()
     MemberSeminarAttendance.query.filter(
         MemberSeminarAttendance.seminar_id == sid).delete()
+    MemberSeminarHost.query.filter(
+        MemberSeminarHost.seminar_id == sid).delete()
     TechnicalSeminar.query.filter(
         TechnicalSeminar.id == sid).delete()
 

conditional/blueprints/conditional.py

@@ -7,6 +7,7 @@
 from conditional.models.models import Conditional, SpringEval, FreshmanEvalData
 from conditional.util.auth import get_user
 from conditional.util.flask import render_template
+from conditional.util.ldap import ldap_get_member, ldap_set_housingpoints
 from conditional.util.user_dict import user_dict_is_eval_director
 
 conditionals_bp = Blueprint('conditionals_bp', __name__)
@@ -91,6 +92,7 @@ def conditional_review(user_dict=None):
     log.info(f'Updated conditional-{cid} to {status}')
     conditional = Conditional.query.filter(Conditional.id == cid)
     cond_obj = conditional.first()
+    uid = cond_obj.uid
 
     conditional.update(
         {
@@ -101,6 +103,12 @@ def conditional_review(user_dict=None):
             {
                 'status': status
             })
+
+        if status == 'Passed':
+            account = ldap_get_member(uid)
+            hp = int(account.housingPoints)
+            ldap_set_housingpoints(account, str(hp + 2))
+
     elif cond_obj.i_evaluation:
         FreshmanEvalData.query.filter(FreshmanEvalData.id == cond_obj.i_evaluation).update(
             {

conditional/blueprints/dashboard.py

@@ -6,6 +6,7 @@
 from conditional.models.models import HouseMeeting
 from conditional.models.models import MemberHouseMeetingAttendance
 from conditional.models.models import MemberSeminarAttendance
+from conditional.models.models import MemberSeminarHost
 from conditional.models.models import TechnicalSeminar
 from conditional.models.models import SpringEval
 from conditional.util.auth import get_user
@@ -106,11 +107,21 @@ def display_dashboard(user_dict=None):
                       MemberSeminarAttendance.uid == uid,
                   ) if is_seminar_attendance_valid(s)]
     data['ts_total'] = len(t_seminars)
+    # technical seminars hosted
+    t_seminars_hosted = [s.seminar_id for s in
+                         MemberSeminarHost.query.filter(
+                            MemberSeminarHost.uid == uid,
+                         ) if is_seminar_attendance_valid(s)]
+    data['ts_hosted_total'] = len(t_seminars_hosted)
     attendance = [m.name for m in TechnicalSeminar.query.filter(
         TechnicalSeminar.id.in_(t_seminars)
         )]
+    hosted = [m.name for m in TechnicalSeminar.query.filter(
+        TechnicalSeminar.id.in_(t_seminars_hosted)
+    )]
 
     data['ts_list'] = attendance
+    data['ts_hosted'] = hosted
 
     spring['mp_status'] = "Failed"
     for mp in data['major_projects']:
@@ -165,6 +176,7 @@ def display_dashboard(user_dict=None):
         'status': gatekeep_result,
         'committee_meetings': gatekeep_info['c_meetings'],
         'technical_seminars': gatekeep_info['t_seminars'],
+        'technical_seminars_hosted': gatekeep_info['t_seminars_hosted'],
         'hm_missed': gatekeep_info['h_meetings_missed']
     }