Add Committee Meetings to Intro Evals Page Pt. 2 #348
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mxmeinhold
reviewed
Mar 27, 2022
jabbate19
force-pushed
the
list-committees
branch
from
533fb33 to
a99020e
Compare
mxmeinhold
reviewed
Mar 31, 2022
Comment on lines
398
to
403
| all_cm = [{"id": m.id, | ||
| "name": m.committee, | ||
| "name": m.directorship, | ||
| "dt_obj": m.timestamp, | ||
| "date": m.timestamp.strftime("%a %m/%d/%Y"), | ||
| "attendees": get_meeting_attendees(m.id), | ||
| "type": "cm" |
There was a problem hiding this comment.
any plan to update all_cm or "type": "cm"?
| @@ -414,13 +414,13 @@ def get_seminar_attendees(meeting_id): | |||
| TechnicalSeminar.timestamp > start_of_year(), | |||
| TechnicalSeminar.approved).all()] | |||
| pend_cm = [{"id": m.id, | |||
| @@ -446,9 +446,9 @@ def get_seminar_attendees(meeting_id): | |||
| @attendance_bp.route('/attendance/alter/cm/<cid>', methods=['POST']) | |||
| @auth.oidc_auth | |||
| @get_user | |||
| def alter_committee_attendance(cid, user_dict=None): | |||
There was a problem hiding this comment.
cid as in committee [meeting] id?
| @@ -510,7 +510,7 @@ def alter_seminar_attendance(sid, user_dict=None): | |||
| @attendance_bp.route('/attendance/ts/<sid>', methods=['GET', 'DELETE']) | |||
| @auth.oidc_auth | |||
| @get_user | |||
| def get_cm_attendees(sid, user_dict=None): | |||
There was a problem hiding this comment.
this is technical seminar attendance?
| @@ -552,28 +552,28 @@ def get_ts_attendees(cid, user_dict=None): | |||
| attendees = [{"value": a.uid, | |||
There was a problem hiding this comment.
and this is cm attendance, (and you didn't change the route name), they're reversed
| @@ -467,8 +467,8 @@ def member_management_upgrade_user(user_dict=None): | |||
| new_acct.eval_date = acct.eval_date | |||
|
|
|||
| db.session.add(new_acct) | |||
| for fca in FreshmanCommitteeAttendance.query.filter(FreshmanCommitteeAttendance.fid == fid): | |||
| spring['committee_meetings'] = len(c_meetings) | ||
| spring['req_meetings'] = req_cm(user_dict['account']) | ||
| h_meetings = [(m.meeting_id, m.attendance_status) for m in get_hm(user_dict['account'])] | ||
| c_meetings = get_directorship_meetings(user_dict['account']) |
| @@ -35,8 +35,8 @@ def render_template(template_name, user_dict=None, **kwargs): | |||
| is_intromember = ldap_is_intromember(user_dict['account']) | |||
| is_rtp = ldap_is_rtp(user_dict['account']) | |||
|
|
|||
| cm_review = len(CommitteeMeeting.query.filter( | |||
| CommitteeMeeting.approved == False).all()) # pylint: disable=singleton-comparison | |||
| cm_review = len(DirectorshipMeeting.query.filter( | |||
| @@ -78,13 +78,13 @@ def get_freshman_data(user_name): | |||
| if freshman_data is None: | |||
| return None | |||
| freshman['status'] = freshman_data.freshman_eval_result | |||
| # number of committee meetings attended | |||
| # number of directorship meetings attended | |||
| c_meetings = [m.meeting_id for m in | |||
| @@ -115,27 +115,27 @@ def get_onfloor_members(): | |||
| if uid in [members.uid for members in ldap_get_onfloor_members()]] | |||
|
|
|||
|
|
|||
| def get_cm(member): | |||
| def get_directorship_meetings(member): | |||
| c_meetings = [{ | |||
mxmeinhold
requested changes
Mar 31, 2022
Comment on lines
+17
to
+30
| def upgrade(): | ||
| # ### commands auto generated by Alembic - please adjust! ### | ||
| op.rename_table('freshman_committee_attendance', 'freshman_directorship_attendance') | ||
| op.rename_table('committee_meetings', 'directorship_meetings') | ||
| op.rename_table('member_committee_attendance', 'member_directorship_attendance') | ||
| # ### end Alembic commands ### | ||
|
|
||
|
|
||
| def downgrade(): | ||
| # ### commands auto generated by Alembic - please adjust! ### | ||
| op.rename_table('freshman_directorship_attendance', 'freshman_committee_attendance') | ||
| op.rename_table('directorship_meetings', 'committee_meetings') | ||
| op.rename_table('member_directorship_attendance', 'member_committee_attendance') | ||
| # ### end Alembic commands ### |
There was a problem hiding this comment.
notably, it looks like this doesn't rename the enum? or any of the column names?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Would keep all information an evals director would want on the intro evals page. Everything else for an intro member's requirements are shown in the table view except for their committee meetings.
Unfucked the old PR, this time featuring screenshots!